an extra comma breaks in 1.8.7, but not 1.9.2
Merge branch 'master' into upgrades
Merge branch 'upgrades' into rails_3.1