Merged r4516 from trunk (i18n 0.4.2 gem is now required: 'gem install -v=0.4.2 i18n', see #7013).
Authored by: jplang 2010-12-18
Parent: [r4531]
Child: [r4533]