Slight changes to ease Rails 2.2 support.
Authored by: jplang 2009-01-04
Parent: [r2233]
Child: [r2235]