Merge 'trunk' into 'DBIx-Class-current'
Matt S Trout [Wed, 22 Mar 2006 06:18:25 +0000 (06:18 +0000)]

Trivial merge