Merge branch 'master' of git://github.com/lifo/docrails

1 files changed, 3 insertions, 3 deletions

diff --git a/railties/lib/rails/plugin.rb b/railties/lib/rails/plugin.rb
index 5614624673..ceddd25eaa 100644
--- a/railties/lib/rails/plugin.rb
+++ b/railties/lib/rails/plugin.rb
@@ -62,13 +62,13 @@ module Rails
     end
 
     initializer :handle_lib_autoload, :before => :set_load_path do |app|
-      paths = if app.config.reload_plugins
+      autoload = if app.config.reload_plugins
         config.autoload_paths
       else
         config.autoload_once_paths
       end
 
-      paths.concat config.paths.lib.to_a
+      autoload.concat paths["lib"].existent
     end
 
     initializer :load_init_rb, :before => :load_config_initializers do |app|
@@ -83,7 +83,7 @@ module Rails
 
     initializer :sanity_check_railties_collision do
       if Engine.subclasses.map { |k| k.root.to_s }.include?(root.to_s)
-        raise "\"#{name}\" is a Railtie/Engine and cannot be installed as plugin"
+        raise "\"#{name}\" is a Railtie/Engine and cannot be installed as a plugin"
       end
     end
   end