tree eb9eab5519fe8c98c3d0779bfbc87934abe0fde7
parent 77ea834dd18533b9e75ba0c5b3f6f38547e0ff97
parent 7e35a8ffbdfc19bf46fc72d903cd9e3a5de35956
author Jean-Baptiste Queru <jbq@google.com> 1258325732 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1258325732 -0800

merge from open-source master