Merge branch 'master' of git://github.com/rails/rails

Conflicts:
	actionmailer/lib/action_mailer/mail_helper.rb
	railties/lib/rails/configuration.rb

1 files changed, 25 insertions, 0 deletions

diff --git a/railties/lib/rails/engine/configurable.rb b/railties/lib/rails/engine/configurable.rb
new file mode 100644
index 0000000000..9a370f0abb
--- /dev/null
+++ b/railties/lib/rails/engine/configurable.rb
@@ -0,0 +1,25 @@
+module Rails
+  class Engine
+    module Configurable
+      def self.included(base)
+        base.extend ClassMethods
+      end
+
+      module ClassMethods
+        delegate :middleware, :root, :paths, :to => :config
+
+        def config
+          @config ||= Engine::Configuration.new(find_root_with_flag("lib"))
+        end
+
+        def inherited(base)
+          raise "You cannot inherit from a Rails::Engine child"
+        end
+      end
+
+      def config
+        self.class.config
+      end
+    end
+  end
+end
\ No newline at end of file