tree f7699cbb9a798281b3558f7e9588fd6d418a7a39
parent 40c6c6704489593564bd9fbb7acba8ecd6c007f4
parent 8199f491720b5bc1736bfa17047f22c5ea10196a
author Jean-Baptiste Queru <jbq@google.com> 1258325717 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1258325717 -0800

merge from open-source master