Merging of gsoc_breadboard

diff --cc lib/Catalyst.pm
Simple merge

diff --cc lib/Catalyst/Container.pm
index 85ccc22,ba71092..e25fc5c
--- 1/lib/Catalyst/Container.pm
--- 2/lib/Catalyst/Container.pm
+++ b/lib/Catalyst/Container.pm
@@@ -43,9 -43,17 +43,17 @@@ has sub_container_class => 
      isa     => LoadableClass,
      is      => 'ro',
      coerce  => 1,
 -    default => 'Bread::Board::Container',
 +    default => 'Catalyst::SubContainer',
  );
  
+ =head1 NAME
+ 
+ Catalyst::Container - IOC for Catalyst components
+ 
+ =head1 METHODS
+ 
+ =cut
+ 
  sub BUILD {
      my $self = shift;
  
@@@ -393,4 -458,32 +458,23 @@@ sub _config_substitutions 
      return $arg;
  }
  
 -=head2 get_component
 -
 -=cut
 -
 -sub get_component {
 -    my ( $self, $type, $name, $args ) = @_;
 -    return $self->get_sub_container($type)->resolve( service => $name, parameters => { context => $args } );
 -}
 -
+ =head1 AUTHORS
+ 
+ =over 4
+ 
+ =item Justin Hunter (arcanez)
+ 
+ =item André Walker (andrewalker)
+ 
+ =back
+ 
+ Based on L<Catalyst::Plugin::ConfigLoader>, by Brian Cassidy.
+ 
+ =head1 LICENSE
+ 
+ This library is free software. You can redistribute it and/or modify it under
+ the same terms as Perl itself.
+ 
+ =cut
+ 
  1;