Rails 3.1 compatibility (order declared on association takes precedence).
Authored by: jplang 2012-02-26
Parent: [r9014]
Child: [r9016]
