tree b321622187db63fbd219e5cb83c0006afcaf88be
parent 241299bf9b1c40412678c0b9f75be55da1c3e171
parent a9986ffe3a5ad3d43d7469258e1e1bcc2fac5bee
author Jean-Baptiste Queru <jbq@google.com> 1258322774 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1258322774 -0800

merge from open-source master

Merge commit 'goog/stage-korg-master' into HEAD