Merge pull request #5971 from carlosantoniodasilva/fix-build-3-2

Add extra order clause to fix failing test on Ruby 1.8.7

activerecord/test/cases/associations/eager_test.rb

@@ -1097,7 +1097,7 @@ def test_join_eager_with_nil_order_should_generate_valid_sql
   end
 
   def test_deep_including_through_habtm
-    posts = Post.find(:all, :include => {:categories => :categorizations}, :order => "posts.id")
+    posts = Post.find(:all, :include => {:categories => :categorizations}, :order => "posts.id, categories.id")
     assert_no_queries { assert_equal 2, posts[0].categories[0].categorizations.length }
     assert_no_queries { assert_equal 1, posts[0].categories[1].categorizations.length }
     assert_no_queries { assert_equal 2, posts[1].categories[0].categorizations.length }