Merge branch 'master' into attribute_helpers

Conflicts:
	Changes

diff --cc Changes
index ab6a8d5,7412ed0..5af4bb4
--- 1/Changes
--- 2/Changes
+++ b/Changes
@@@ -1,15 -1,7 +1,17 @@@
  Also see Moose::Manual::Delta for more details of, and workarounds
  for, noteworthy changes.
  
 +next version
 +    * 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::Meta::Attribute::Native
++      - Moved in from MooseX::AttributeHelpers with API tweaks. See
++        Moose::Manual::Delta for details. (hdp, jhannah, rbuels, Sartak,
++        perigrin, doy)
 +
+ 0.89 Thu Aug 13, 2009
      * Moose::Manual::Attributes
        - Clarify "is", include discussion of "bare". (Sartak)
  

diff --cc lib/Moose.pm
Simple merge

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

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

diff --cc lib/Moose/Meta/Method/Delegation.pm
Simple merge

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

diff --cc xt/author/pod_spell.t
Simple merge