Merged Rails 2.0 compatibility changes.
Compatibility with Rails 1.2 is preserved.
Authored by: jplang 2007-12-10
Parent: [r974]
Child: [r976]