Merge 'DBIx-Class-current' into 'storage_exceptions'

Merge 'DBIx-Class-current' into 'storage_exceptions'

r6046@evoc8 (orig r2206):  matthewt | 2006-07-16 15:32:14 -0500
bah.
r6047@evoc8 (orig r2207):  matthewt | 2006-07-16 21:35:46 -0500
minor fixup to _merge_attr
r10757@evoc8 (orig r2210):  castaway | 2006-07-18 13:03:26 -0500
Localise Data::Dumper global vars in example

r10758@evoc8 (orig r2211):  semifor | 2006-07-18 16:12:54 -0500
Use _sql_maker_opts, now.

r10768@evoc8 (orig r2214):  matthewt | 2006-07-19 17:29:59 -0500
Callback now gets args
r10769@evoc8 (orig r2215):  matthewt | 2006-07-19 17:39:12 -0500
and once more, with feeling