am 9b5a5a0f: am eb69ddd4: am c2e35f33: (-s ours) am 932e8e5d: (-s ours) Reconcile...
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:34:30 +0000 (12:34 -0700)]
* commit '9b5a5a0f9dac0b5d7d540e1669bbccc74c1a37d2':


Trivial merge