Merge 'trunk' into 'sybase'

sync to trunk

diff --cc examples/Schema/MyDatabase/Main.pm
Simple merge

diff --cc examples/Schema/MyDatabase/Main/Artist.pm
Simple merge

diff --cc examples/Schema/MyDatabase/Main/Cd.pm
Simple merge

diff --cc examples/Schema/MyDatabase/Main/Track.pm
Simple merge

diff --cc examples/Schema/testdb.pl
Simple merge

diff --cc lib/DBIx/Class/Storage/DBI.pm
Simple merge