X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;h=7523068e30bf46df92e8fbb68e8fd7270968e747;hp=4ee89dffd23a6e574701ada2d4f82ccd39dde48a;hb=599b52952b28f527af103cdf9f134b09ccd522e3;hpb=1f6bb7993ce667b329e9bcb6d9d3f3a7f947b398

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 4ee89df..7523068 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -127,6 +127,8 @@ Returns a hashref containing your applications settings.
 sub import {
     my ( $class, @arguments ) = @_;
 
+    return unless $class eq 'Catalyst';
+
     my $caller = caller(0);
     
     # Prepare inheritance
@@ -135,7 +137,6 @@ sub import {
         no strict 'refs';
         push @{"$caller\::ISA"}, $class;
         
-        *{"$caller\::import"} = sub { 1 };
     }
 
     $caller->arguments( [ @arguments ] );