Merge branch 'master' into attribute_helpers

Conflicts:
	Changes

diff --cc Changes
index 689705c,a620ca0..ced07dc
--- 1/Changes
--- 2/Changes
+++ b/Changes
@@@ -1,17 -1,13 +1,22 @@@
  Also see Moose::Manual::Delta for more details of, and workarounds
  for, noteworthy changes.
  
- 0.85
++
 +    * Moose::Meta::Attribute
-       - The warning for 'no associated methods' is now split out into the
-         _check_associated_methods method, so that extensions can safely call
-         'after install_accessors => ...'. (hdp)
-       - Move currying syntax for delegation in from AttributeHelpers. (hdp)
++      - 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)
 +
+ 0.85 Fri, Jun 26, 2009
+     * Moose::Meta::Attribute
+       - The warning for 'no associated methods' is now split out into
+         the _check_associated_methods method, so that extensions can
+         safely call 'after install_accessors => ...'. This fixes a
+         warning from MooseX::AttributeHelpers. (hdp)
+ 
  0.84 Fri, Jun 26, 2009
      * Moose::Role
        - has now sets definition_context for attributes defined in

diff --cc lib/Moose.pm
Simple merge

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

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