Merge branch 'master' of git://github.com/jshirley/catalyst-action-rest

diff --combined lib/Catalyst/Action/REST.pm
index 6c6dfc2,92e7f1a..95465a9
--- 1/lib/Catalyst/Action/REST.pm
--- 2/lib/Catalyst/Action/REST.pm
+++ b/lib/Catalyst/Action/REST.pm
@@@ -18,12 -18,12 +18,12 @@@ use Catalyst::Controller::REST
  
  BEGIN { require 5.008001; }
  
 -our $VERSION = '0.67_01';
 +our $VERSION = '0.68';
  
  sub new {
    my $class  = shift;
    my $config = shift;
-   Catalyst::Request::REST->_insert_self_into($config->{class});
+   Catalyst::Request::REST->_insert_self_into( $config->{class} );
    return $class->SUPER::new($config, @_);
  }
  

diff --combined lib/Catalyst/Action/SerializeBase.pm
index c742477,d4c53b9..93108bb
--- 1/lib/Catalyst/Action/SerializeBase.pm
--- 2/lib/Catalyst/Action/SerializeBase.pm
+++ b/lib/Catalyst/Action/SerializeBase.pm
@@@ -11,15 -11,14 +11,13 @@@ use warnings
  
  use base 'Catalyst::Action';
  use Module::Pluggable::Object;
 -use Data::Dump qw(dump);
  use Catalyst::Request::REST;
  use Catalyst::Utils ();
  
  sub new {
    my $class  = shift;
    my $config = shift;
-   Catalyst::Request::REST->_insert_self_into(
-     Catalyst::Utils::class2appclass($config->{class})
-   );
+   Catalyst::Request::REST->_insert_self_into( $config->{class} );
    return $class->SUPER::new($config, @_);
  }
  
@@@ -55,9 -54,6 +53,9 @@@ sub _load_content_plugins 
          $c->log->info("Using deprecated configuration for Catalyst::Action::REST!");
          $c->log->info("Please see perldoc Catalyst::Action::REST for the update guide");
          $config = $controller->{'serialize'};
 +        # if they're using the deprecated config, they may be expecting a
 +        # default mapping too.
 +        $config->{map} ||= $controller->{map};
      } else {
          $config = $controller;
      }