Conflicts:
	test/apps/rails3/app/controllers/home_controller.rb
	test/tests/test_rails3.rb