tree cadd4d0da07cd39e979e656edc4f6a90c70764a7
parent 905c2d0116da949bbbee4caed9958e774f00e0d3
parent 7488a0afce8c685d752dbbc1eb27cc0782fc921a
author Jean-Baptiste Queru <jbq@google.com> 1258325713 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1258325713 -0800

merge from open-source master