Merge branch 'master' into renames-and-deprecations
Dave Rolsky [Sun, 5 Apr 2009 16:20:37 +0000 (11:20 -0500)]
Conflicts:
xt/pod_coverage.t

1  2 
lib/Class/MOP/Attribute.pm
lib/Class/MOP/Class.pm
lib/Class/MOP/Instance.pm
lib/Class/MOP/Method/Accessor.pm
lib/Class/MOP/Method/Constructor.pm
lib/Class/MOP/Module.pm
xt/pod_coverage.t

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -42,6 -42,11 +43,8 @@@ my %trustme = 
          'update_package_cache_flag',
          'wrap_method_body',
  
 -        # doc'd under get_all_attributes
 -        'compute_all_applicable_attributes',
 -
+         # doc'd with rebless_instance
+         'rebless_instance_away',
      ],
  
      'Class::MOP::Instance' => [