am 932e8e5d: (-s ours) Reconcile with jb-mr1-release - do not merge
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:23:00 +0000 (12:23 -0700)]
* commit '932e8e5dacd4e154d5c7b94f396a4d32de931551':


Trivial merge