Merged Rails 2.1 compatibility branch.
Authored by: jplang 2008-07-04
Parent: [r1622]
Child: [r1624]