Reconcile with jb-mr1-release - do not merge

This commit is contained in:
Jean-Baptiste Queru 2013-03-11 12:22:23 -07:00
commit 12bc4c4bab

Diff content is not available