Merge 'trunk' into 'DBIx-Class-current'
Brandon L. Black [Sun, 23 Jul 2006 21:31:35 +0000 (21:31 +0000)]
r7299@moloko (orig r2592):  matthewt | 2006-07-22 19:23:56 -0500
yes, I didn't get the merge quite right. again.
r7347@moloko (orig r2603):  matthewt | 2006-07-23 14:31:41 -0500
yeah, yeah, yeah


Trivial merge