Need to declare optional dependencies from AS

actionpack/Gemfile

@@ -9,6 +9,12 @@ only :test do
   gem "mocha"
   gem "sqlite3-ruby"
   gem "RedCloth"
+
+  activesupport_vendor = rails_root.join('activesupport', 'lib', 'active_support', 'vendor')
+
+  gem 'builder', '2.1.2', :vendored_at => activesupport_vendor.join('builder-2.1.2')
+  gem 'memcache-client', '1.6.5', :vendored_at => activesupport_vendor.join('memcache-client-1.6.5')
+  gem 'tzinfo', '0.3.13', :vendored_at => activesupport_vendor.join('tzinfo-0.3.13')
 end
 
-disable_system_gems
\ No newline at end of file
+disable_system_gems

actionpack/test/abstract_controller/test_helper.rb

@@ -2,6 +2,9 @@
 $:.unshift(File.dirname(__FILE__) + '/../../../activesupport/lib')
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 
+bundler = File.join(File.dirname(__FILE__), '..', '..', 'vendor', 'gems', 'environment')
+require bundler if File.exist?("#{bundler}.rb")
+
 require 'rubygems'
 require 'test/unit'
 require 'active_support'