Reconcile with jb-mr1-release - do not merge
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 19:20:50 +0000 (12:20 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 19:20:50 +0000 (12:20 -0700)
commitd2e43dce632fdcdf56927635b6bbd48d90ec796d
tree84363855e22bd883dea8b56ac8418fb73017d96b
parentd881a0ce901d839282ba2d4d724b9ae25c9d4e89
parent7219980a19c026fb454c1decdd2eacd22691df6b
Reconcile with jb-mr1-release - do not merge