Merge branch 'stable'

* stable:
  Version 1.12
  remove some undocumented apis from our tests

Conflicts:
	Changes

diff --cc Changes
index 0ae8cf0,0af9cc0..f8801eb
--- 1/Changes
--- 2/Changes
+++ b/Changes
@@@ -1,19 -1,9 +1,23 @@@
  Revision history for Perl extension Class-MOP.
  
 +NEXT
 +
 +  [API CHANGES]
 +
 +  * The internal code used to generate inlined methods (accessor, constructor,
 +    etc.) has been massively rewritten. MooseX modules that do inlining will
 +    almost certainly need to be updated as well.
 +
 +  [ENHANCEMENTS]
 +
 +  * A lot of code related to managing methods for a class has been tweaked to
 +    make it faster. This speeds up compilation time for Class::MOP and Moose,
 +    as well modules which use Moose.
 +
+ 1.12 Mon, Jan 3, 2011
+ 
+   * Remove usage of undocumented Package::Stash APIs from the tests. This
+     prevents the tests from failing on Package::Stash >= 0.18.
  
  1.11 Sun, Oct 31, 2010
  

diff --cc lib/Class/MOP.pm
Simple merge

diff --cc lib/Class/MOP/Attribute.pm
Simple merge

diff --cc lib/Class/MOP/Class.pm
Simple merge

diff --cc lib/Class/MOP/Class/Immutable/Trait.pm
Simple merge

diff --cc lib/Class/MOP/Deprecated.pm
Simple merge

diff --cc lib/Class/MOP/Instance.pm
Simple merge

diff --cc lib/Class/MOP/Method/Accessor.pm
index c52a642,3ce814f..01b3ecf
--- 1/lib/Class/MOP/Method/Accessor.pm
--- 2/lib/Class/MOP/Method/Accessor.pm
+++ b/lib/Class/MOP/Method/Accessor.pm
@@@ -6,9 -6,8 +6,9 @@@ use warnings
  
  use Carp         'confess';
  use Scalar::Util 'blessed', 'weaken';
 +use Try::Tiny;
  
- our $VERSION   = '1.11';
+ our $VERSION   = '1.12';
  $VERSION = eval $VERSION;
  our $AUTHORITY = 'cpan:STEVAN';
  

diff --cc lib/Class/MOP/Method/Constructor.pm
index 31392dd,3eb342f..29017ed
--- 1/lib/Class/MOP/Method/Constructor.pm
--- 2/lib/Class/MOP/Method/Constructor.pm
+++ b/lib/Class/MOP/Method/Constructor.pm
@@@ -6,9 -6,8 +6,9 @@@ use warnings
  
  use Carp         'confess';
  use Scalar::Util 'blessed', 'weaken';
 +use Try::Tiny;
  
- our $VERSION   = '1.11';
+ our $VERSION   = '1.12';
  $VERSION = eval $VERSION;
  our $AUTHORITY = 'cpan:STEVAN';
  

diff --cc lib/Class/MOP/Method/Generated.pm
index abdeb65,a06f115..450c149
--- 1/lib/Class/MOP/Method/Generated.pm
--- 2/lib/Class/MOP/Method/Generated.pm
+++ b/lib/Class/MOP/Method/Generated.pm
@@@ -5,9 -5,8 +5,9 @@@ use strict
  use warnings;
  
  use Carp 'confess';
 +use Eval::Closure;
  
- our $VERSION   = '1.11';
+ our $VERSION   = '1.12';
  $VERSION = eval $VERSION;
  our $AUTHORITY = 'cpan:STEVAN';
  

diff --cc lib/Class/MOP/Method/Inlined.pm
Simple merge

diff --cc lib/Class/MOP/Mixin/AttributeCore.pm
Simple merge

diff --cc lib/Class/MOP/Mixin/HasAttributes.pm
Simple merge

diff --cc lib/Class/MOP/Mixin/HasMethods.pm
Simple merge

diff --cc lib/Class/MOP/Module.pm
Simple merge

diff --cc lib/Class/MOP/Package.pm
Simple merge