Merged r10167 from trunk to 2.0-stable
Gemfile: mocha version up 0.12.3.
Authored by: tmaruyama 2012-08-08
Parent: [r10169]
Child: [r10171]
