Merging 17905:17944 from trunk.
authorMatt Amos <zerebubuth@gmail.com>
Fri, 2 Oct 2009 15:36:46 +0000 (15:36 +0000)
committerMatt Amos <zerebubuth@gmail.com>
Fri, 2 Oct 2009 15:36:46 +0000 (15:36 +0000)
1  2 
config/locales/en.yml

Simple merge