Merge master into gsoc_breadboard

diff --cc Makefile.PL
index 8ebe336,4b83510..bcc2810
--- 1/Makefile.PL
--- 2/Makefile.PL
+++ b/Makefile.PL
@@@ -11,13 -22,13 +22,14 @@@ if ($Module::Install::AUTHOR) { # We co
  perl_version '5.008003';
  
  name 'Catalyst-Runtime';
+ author 'Sebastian Riedel <sri@cpan.org>';
+ authority('MSTROUT');
  all_from 'lib/Catalyst/Runtime.pm';
  
 +requires 'Bread::Board';
  requires 'List::MoreUtils';
  requires 'namespace::autoclean' => '0.09';
- requires 'namespace::clean' => '0.13';
- requires 'B::Hooks::EndOfScope' => '0.10';
+ requires 'namespace::clean' => '0.23';
  requires 'MooseX::Emulate::Class::Accessor::Fast' => '0.00903';
  requires 'Class::Load' => '0.12';
  requires 'Class::MOP' => '0.95';

diff --cc lib/Catalyst.pm
Simple merge

diff --cc lib/Catalyst/Controller.pm
Simple merge

diff --cc lib/Catalyst/Utils.pm
Simple merge

diff --cc t/lib/TestApp.pm
index 1dfe999,d1d8797..29060e8
--- 1/t/lib/TestApp.pm
--- 2/t/lib/TestApp.pm
+++ b/t/lib/TestApp.pm
@@@ -116,7 -124,17 +125,21 @@@ sub finalize_error 
      sub Catalyst::Log::error { }
  }
  
++<<<<<<< HEAD
 +# Make sure we can load Inline plugins.
++=======
+ # Pretend to be Plugin::Session and hook finalize_headers to send a header
+ 
+ sub finalize_headers {
+     my $c = shift;
+ 
+     $c->res->header('X-Test-Header', 'valid');
+ 
+     return $c->maybe::next::method(@_);
+ }
+ 
+ # Make sure we can load Inline plugins. 
++>>>>>>> origin/master
  
  package Catalyst::Plugin::Test::Inline;