Conflicts:

	activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
	activerecord/test/cases/base_test.rb
	activerecord/test/cases/quoting_test.rb