Reconcile with jb-mr1-release - do not merge

This commit is contained in:
Jean-Baptiste Queru 2013-03-11 12:20:38 -07:00
commit c2f34af0d9

Diff content is not available