tree b321622187db63fbd219e5cb83c0006afcaf88be
parent 241299bf9b1c40412678c0b9f75be55da1c3e171
parent 9c269f4c6f27f15256d4a08ff1e3640b3c47b6fd
author Jean-Baptiste Queru <jbq@google.com> 1258325713 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1258325713 -0800

merge from open-source master