Merge 'trunk' into 'DBIx-Class-current'
David Kamholz [Thu, 9 Feb 2006 20:00:11 +0000 (20:00 +0000)]

Trivial merge