Fix overriding of ActiveRecord::Base.set_table_name to properly pass a &block to aliased method
Fix error in Rails 2.x/3.0 association definition
Merge branch 'rails3_association_includes_fix'
Merge branch 'set_table_name_with_block'