Merge 'trunk' into 'better_scripts'

r13204@nc10 (orig r12073):  rafl | 2009-11-29 16:43:17 +0000
Depend on a recent leakchecker to stop everything from crapping over itself if PadWalker is too old.

diff --combined Makefile.PL
index 4ec0a51,e30b031..093e32a
--- 1/Makefile.PL
--- 2/Makefile.PL
+++ b/Makefile.PL
@@@ -18,11 -18,10 +18,11 @@@ all_from 'lib/Catalyst/Runtime.pm'
  requires 'List::MoreUtils';
  requires 'namespace::autoclean' => '0.09';
  requires 'namespace::clean';
 +requires 'namespace::autoclean';
  requires 'B::Hooks::EndOfScope' => '0.08';
  requires 'MooseX::Emulate::Class::Accessor::Fast' => '0.00903';
 -requires 'Class::MOP' => '0.83';
 -requires 'Moose' => '0.90';
 +requires 'Class::MOP' => '0.95';
 +requires 'Moose' => '0.93';
  requires 'MooseX::MethodAttributes::Inheritable' => '0.17';
  requires 'MooseX::Role::WithOverloading' => '0.03';
  requires 'Carp';
@@@ -48,11 -47,10 +48,11 @@@ requires 'URI' => '1.35'
  requires 'Task::Weaken';
  requires 'Text::Balanced'; # core in 5.8.x but mentioned for completeness
  requires 'MRO::Compat';
 +requires 'MooseX::Getopt' => '0.25';
 +requires 'MooseX::Types';
 +requires 'MooseX::Types::Common::Numeric';
  requires 'String::RewritePrefix' => '0.004'; # Catalyst::Utils::resolve_namespace
  
 -recommends 'B::Hooks::OP::Check::StashChange';
 -
  test_requires 'Class::Data::Inheritable';
  test_requires 'Test::Exception';
  test_requires 'Test::More' => '0.88';
@@@ -67,7 -65,7 +67,7 @@@ else 
          grep { $_ ne 't/aggregate.t' }
          map  { glob } qw[t/*.t t/aggregate/*.t];
  }
- author_requires 'CatalystX::LeakChecker', '0.03'; # Skipped if this isn't installed
+ author_requires 'CatalystX::LeakChecker', '0.05'; # Skipped if this isn't installed
  author_requires 'File::Copy::Recursive'; # For http server test
  
  author_tests 't/author';