Merge remote-tracking branch 'goog/jb-mr2-release'
Ed Heyl [Wed, 20 Feb 2013 21:47:33 +0000 (13:47 -0800)]

Trivial merge