Merged r10155 from trunk to 1.4-stable
Gemfile: pin mocha version 0.12.1.
Authored by: tmaruyama 2012-08-07
Parent: [r10167]
Child: [r10169]