Merge commit 'origin/master' into savepoints

Conflicts:
	activerecord/lib/active_record/fixtures.rb
	activerecord/test/cases/defaults_test.rb

1 files changed, 2 insertions, 3 deletions

diff --git a/activesupport/lib/active_support/cache/drb_store.rb b/activesupport/lib/active_support/cache/drb_store.rb
index b80c2ee4d5..b16ed25aa3 100644
--- a/activesupport/lib/active_support/cache/drb_store.rb
+++ b/activesupport/lib/active_support/cache/drb_store.rb
@@ -1,15 +1,14 @@
-require 'drb'
-
 module ActiveSupport
   module Cache
     class DRbStore < MemoryStore #:nodoc:
       attr_reader :address
 
       def initialize(address = 'druby://localhost:9192')
+        require 'drb' unless defined?(DRbObject)
         super()
         @address = address
         @data = DRbObject.new(nil, address)
       end
     end
   end
-end
\ No newline at end of file
+end