tree eb9eab5519fe8c98c3d0779bfbc87934abe0fde7
parent 98916fdbff9181eb8491e33d7f87405a6ba2b95e
parent a015c9d506a756acd7aa9f8c67d5c9649fa2b7fc
author Jean-Baptiste Queru <jbq@google.com> 1258322817 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1258322817 -0800

merge from open-source master

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