* master:
  rm dup code

Conflicts:
	activerecord/test/cases/relations_test.rb