Merge branch 'master' into attribute_helpers

diff --cc Changes
index 835cee0,1337cbe..689705c
--- 1/Changes
--- 2/Changes
+++ b/Changes
@@@ -4,13 -4,8 +4,13 @@@ 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
+         _check_associated_methods method, so that extensions can safely call
          'after install_accessors => ...'. (hdp)
 +      - Move currying syntax for delegation in from AttributeHelpers. (hdp)
 +
 +    * Moose::AttributeHelpers
 +      - Moved in from MooseX with API tweaks. See Moose::Manual::Delta for
 +        details. (hdp, jhannah, rbuels)
  
  0.84 Fri, Jun 26, 2009
      * Moose::Role

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