Merging 17846:17904 from trunk.
authorMatt Amos <zerebubuth@gmail.com>
Thu, 1 Oct 2009 17:23:01 +0000 (17:23 +0000)
committerMatt Amos <zerebubuth@gmail.com>
Thu, 1 Oct 2009 17:23:01 +0000 (17:23 +0000)
1  2 
config/locales/en.yml

Simple merge