Merge branch 'master' into role-methods
Shawn M Moore [Sun, 31 May 2009 02:49:31 +0000 (22:49 -0400)]
Conflicts:
lib/Moose/Meta/Role.pm


Trivial merge