Merge 'trunk' into 'DBIx-Class-resultset'
Jess Robinson [Mon, 9 Jan 2006 04:26:50 +0000 (04:26 +0000)]

Trivial merge