support rails 2.3
Merge branch 'master' of github.com:Telmate/mytrilogy