merge trunk to method-changes branch

diff --cc Changes
index 88ea17e,397f731..1685b22
--- 1/Changes
--- 2/Changes
+++ b/Changes
@@@ -1,24 -1,16 +1,35 @@@
  Revision history for Perl extension Moose
  
 -0.58
 +0.5x
 +    !! This release has an incompatible change regarding !!
 +       how roles add methods to a class !!
 +
 +    * Roles and role application
 +      ! Roles now add methods by calling add_method, not
 +        alias_method. They make sure to always provide a method
 +        object, which will be cloned internally. This means that it is
 +        now possible to track the source of a method provided by a
 +        role, and even follow its history through intermediate roles.
 +
 +        This means that methods added by a role now show up when
 +        looking at a class's method list/map. (Dave Rolsky)
 +
 +    * Moose::Meta::Method::Delegation
 +    * Moose::Meta::Attribute
 +      - Delegation methods now have their own method class. (Dave
 +        Rolsky)
 +
+     * Moose::Exporter
+     * Moose
+       - Moose::Exporter will no longer remove a subroutine that the
+         exporting package re-exports. Moose re-exports the
+         Carp::confess function, among others. The reasoning is that we
+         cannot know whether you have also explicitly imported those
+         functions for your own use, so we err on the safe side and
+         always keep them. (Dave Rolsky)
+         - added tests for this (rafl)
+ 
++<<<< 122127346164625
  0.57 Wed September 3, 2008
      * Moose::Intro
        - A new bit of doc intended to introduce folks familiar with