Merge branch 'master' into attribute_helpers

Conflicts:
	Changes

diff --cc Changes
index b254acc,78b6653..5a8f72f
--- 1/Changes
--- 2/Changes
+++ b/Changes
@@@ -2,18 -2,15 +2,24 @@@ Also see Moose::Manual::Delta for more 
  for, noteworthy changes.
  
  0.88
+     Japan Perl Association has sponsored Goro Fuji to improve
+     startup performance of Class::MOP and Moose. These enhancements
+     may break backwards compatibility if you're doing (or using)
+     complex metaprogramming, so, as always, test your code!
+     http://blog.perlassociation.org/2009/07/jpa-sponsors-moose-class-mop-work.html
+ 
      * Moose::Meta::Method::Accessor
        - No longer uses inline_slot_access in accessors, to support
-         non-lvalue-based meta instances.
+         non-lvalue-based meta instances. (sorear)
 +
 +    * Moose::Meta::Attribute
 +      - Added the currying syntax for delegation from AttributeHelpers
 +        to the existing delegation API. (hdp)
 +
 +    * Moose::AttributeHelpers
 +      - Moved in from MooseX with API tweaks. See Moose::Manual::Delta for
 +        details. (hdp, jhannah, rbuels)
 +
      * Moose::Manual::Contributing
        - Re-write the Moose::Manual::Contributing document to reflect the new
          layout and methods of work for the Git repository. All work now should
@@@ -21,7 -18,12 +27,13 @@@
          being applied to master. All releases are done by a cabal member and
          merged from master to stable. This plan was devised by Yuval, blame
          him. (perigrin)
 +
+     * Moose::Meta::Role
+       - Create metaclass attributes for the different role application classes.
+         (rafl)
+     * Moose::Util::MetaRole
+       - Allow applying roles to a meta role's role application classes. (rafl)
+ 
  0.87 Tue Jul 7, 2009
      * Moose::Meta::Method::Delegation
        - Once again allow class names as well as objects for

diff --cc lib/Moose/Manual/Delta.pod
Simple merge

diff --cc lib/Moose/Meta/Role.pm
Simple merge