tree 3b97b39a016c6a3b42b424b9113b18a4e6895f28
parent 7ce9bd763f29959ba3c448ba8584d6711c6a40bc
parent dde8ab037540aaec554a471d67613b959cc0e9f4
author Jean-Baptiste Queru <jbq@google.com> 1249936899 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1249936899 -0700

merge from open-source master