Merge rails_port as of r4613 & fix tests.
[rails.git] / db / migrate / 006_add_relations.rb