Merge 'trunk' into 'DBIx-Class-current'
authorBrandon L. Black <blblack@gmail.com>
Sun, 23 Jul 2006 21:31:35 +0000 (21:31 +0000)
committerBrandon L. Black <blblack@gmail.com>
Sun, 23 Jul 2006 21:31:35 +0000 (21:31 +0000)
commit2359353990ae5b1961bb9585cfa915cf0cee5642
tree02e4ff5336c0ba240da4d066258bc8f8bce4bc9b
parente92b9177067091b83564fa553f19796b1825095e
parentcebfddb3f2a7b76b82e76bf24292ad5b46ab764b
Merge 'trunk' into 'DBIx-Class-current'

r7299@moloko (orig r2592):  matthewt | 2006-07-22 19:23:56 -0500
yes, I didn't get the merge quite right. again.
r7347@moloko (orig r2603):  matthewt | 2006-07-23 14:31:41 -0500
yeah, yeah, yeah