3 files changed, 18 insertions, 4 deletions
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index f4990bfb4c..41aecea355 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -327,7 +327,7 @@ module Rails
         paths = []
         namespaces.each do |namespace|
           pieces = namespace.split(":")
-          paths << pieces.dup.push(pieces.last).join("/") unless pieces.uniq.size == 1
+          paths << pieces.dup.push(pieces.last).join("/")
           paths << pieces.join("/")
         end
         paths.uniq!
diff --git a/railties/lib/rails/generators/rails/app/templates/app/mailers/.empty_directory b/railties/lib/rails/generators/rails/app/templates/app/mailers/.empty_directory
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/railties/lib/rails/generators/rails/app/templates/app/mailers/.empty_directory
diff --git a/railties/lib/rails/ruby_version_check.rb b/railties/lib/rails/ruby_version_check.rb
index 994df17e65..e8d1d1e039 100644
--- a/railties/lib/rails/ruby_version_check.rb
+++ b/railties/lib/rails/ruby_version_check.rb
@@ -1,10 +1,24 @@
-ruby_release = "#{RUBY_VERSION} (#{RUBY_RELEASE_DATE})"
-if ruby_release < '1.8.7' || (ruby_release > '1.8' && ruby_release < '1.9.2')
+if RUBY_VERSION < '1.8.7'
+  desc = defined?(RUBY_DESCRIPTION) ? RUBY_DESCRIPTION : "ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE})"
   abort <<-end_message
 
     Rails 3 requires Ruby 1.8.7 or 1.9.2.
 
-    You're running #{ruby_release}; please upgrade to continue.
+    You're running
+      #{desc}
+
+    Please upgrade to continue.
+
+  end_message
+elsif RUBY_VERSION > '1.9' and RUBY_VERSION < '1.9.2'
+  $stderr.puts <<-end_message
+
+    Rails 3 doesn't officially support Ruby 1.9.1 since recent stable
+    releases have segfaulted the test suite. Please upgrade to Ruby 1.9.2
+    before Rails 3 is released!
+
+    You're running
+      #{RUBY_DESCRIPTION}
 
   end_message
 end