tree f1b1d48265b4a4367e1660770be0d5587abc7a31
parent 6b111af953e311805810388b68a78735b6f7ea81
parent a9fd63ad6d8f43d9891cc028c92b76be3a311f13
author Jean-Baptiste Queru <jbq@google.com> 1258325717 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1258325717 -0800

merge from open-source master