Index: app/models/user.rb
===================================================================
--- app/models/user.rb	(revision 2129)
+++ app/models/user.rb	(working copy)
@@ -144,7 +144,7 @@
   end
   
   def time_zone
-    @time_zone ||= (self.pref.time_zone.blank? ? nil : TimeZone[self.pref.time_zone])
+    @time_zone ||= (self.pref.time_zone.blank? ? nil : ActiveSupport::TimeZone[self.pref.time_zone])
   end
   
   def wants_comments_in_reverse_order?
Index: app/views/my/account.rhtml
===================================================================
--- app/views/my/account.rhtml	(revision 2129)
+++ app/views/my/account.rhtml	(working copy)
@@ -38,7 +38,7 @@
 <div class="box tabular">
 <% fields_for :pref, @user.pref, :builder => TabularFormBuilder, :lang => current_language do |pref_fields| %>
 <p><%= pref_fields.check_box :hide_mail %></p>
-<p><%= pref_fields.select :time_zone, TimeZone.all.collect {|z| [ z.to_s, z.name ]}, :include_blank => true %></p>
+<p><%= pref_fields.select :time_zone, ActiveSupport::TimeZone.all.collect {|z| [ z.to_s, z.name ]}, :include_blank => true %></p>
 <p><%= pref_fields.select :comments_sorting, [[l(:label_chronological_order), 'asc'], [l(:label_reverse_chronological_order), 'desc']] %></p>
 <% end %>
 </div>
Index: vendor/plugins/engines/lib/engines/rails_extensions/dependencies.rb
===================================================================
--- vendor/plugins/engines/lib/engines/rails_extensions/dependencies.rb	(revision 2129)
+++ vendor/plugins/engines/lib/engines/rails_extensions/dependencies.rb	(working copy)
@@ -140,4 +140,4 @@
   end  
 end
 
-Dependencies.send :include, Engines::RailsExtensions::Dependencies
+ActiveSupport::Dependencies.send :include, Engines::RailsExtensions::Dependencies
Index: vendor/plugins/classic_pagination/lib/pagination.rb
===================================================================
--- vendor/plugins/classic_pagination/lib/pagination.rb	(revision 2129)
+++ vendor/plugins/classic_pagination/lib/pagination.rb	(working copy)
@@ -97,8 +97,8 @@
             "Unknown options: #{unknown_option_keys.join(', ')}" unless
               unknown_option_keys.empty?
 
-      options[:singular_name] ||= Inflector.singularize(collection_id.to_s)
-      options[:class_name]  ||= Inflector.camelize(options[:singular_name])
+      options[:singular_name] ||= ActiveSupport::Inflector.singularize(collection_id.to_s)
+      options[:class_name]  ||= ActiveSupport::Inflector.camelize(options[:singular_name])
     end
 
     # Returns a paginator and a collection of Active Record model instances
Index: vendor/plugins/actionwebservice/init.rb
===================================================================
--- vendor/plugins/actionwebservice/init.rb	(revision 2129)
+++ vendor/plugins/actionwebservice/init.rb	(working copy)
@@ -1,7 +1,7 @@
 require 'action_web_service'
 
 # These need to be in the load path for action_web_service to work
-Dependencies.load_paths += ["#{RAILS_ROOT}/app/apis"]
+ActiveSupport::Dependencies.load_paths += ["#{RAILS_ROOT}/app/apis"]
   
 # AWS Test helpers
 require 'action_web_service/test_invoke' if ENV['RAILS_ENV'] && ENV['RAILS_ENV'] =~ /^test/