tree dc00c34fe21c4b8fbd3bbdc7d29ee49e80406a66
parent 44a9d066c0785b7e6a64f41eb82732b5037d3d53
parent e0c54121b0036117079e5e2b28a913a34d5053ab
author Jean-Baptiste Queru <jbq@google.com> 1249571726 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1249571726 -0700

merge from open-source master