Merge 'trunk' into 'DBIx-Class-current'
Matt S Trout [Sun, 19 Mar 2006 05:26:18 +0000 (05:26 +0000)]
r8940@obrien (orig r1250):  matthewt | 2006-03-18 23:26:18 +0000
Post-merge fixups


Trivial merge