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)

Trivial merge