Merge branch 'master' of git.shadowcat.co.uk:DBIx-Class
Peter Rabbitson [Thu, 10 Jun 2010 09:23:48 +0000 (11:23 +0200)]

Trivial merge