Merge 'trunk' into 'DBIx-Class-current'
Matt S Trout [Sun, 14 May 2006 23:25:56 +0000 (23:25 +0000)]
r5922@cain (orig r1623):  matthewt | 2006-05-14 18:25:56 +0000
tweaked might_have test for -current


Trivial merge