Merge branch 'master' into docrails

1 files changed, 6 insertions, 3 deletions

diff --git a/Gemfile b/Gemfile
index a51c560232..ea9842c0c5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,14 +7,17 @@ gem "rails", "3.0.0.beta1"
 gem "rake",  ">= 0.8.7"
 gem "mocha", ">= 0.9.8"
 
-if RUBY_VERSION < '1.9'
-  gem "ruby-debug", ">= 0.10.3"
+group :mri do
+  if RUBY_VERSION < '1.9'
+    gem "system_timer"
+    gem "ruby-debug", ">= 0.10.3"
+  end
 end
 
 # AR
 gem "sqlite3-ruby", ">= 1.2.5", :require => 'sqlite3'
 
-group :test do
+group :db do
   gem "pg", ">= 0.9.0"
   gem "mysql", ">= 2.8.1"
 end