tree a5d3ea486b907c77abd820d7df12fb224ed0a417
parent 6934ac109bf80019d70ea684c203f12ca58c365e
parent a85355fd3e67e7a006e0f8b90c8142c0aefffce0
author Jean-Baptiste Queru <jbq@google.com> 1258311569 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1258311569 -0800

merge from open-source master