am eb69ddd4: am c2e35f33: (-s ours) am 932e8e5d: (-s ours) Reconcile with jb-mr1...
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:32:01 +0000 (12:32 -0700)]
* commit 'eb69ddd4db1f1a421f1d27e1d42d557f0897f08e':


Trivial merge