tree 5770d810bb9499f6bb2182035a0f29ab89ad940c
parent a7b5e20e9cf0bbd3673d04cfcd04fd6e5a57d45c
parent 95604529ec25fe7923ba88312c590f38aa5e3d9e
author Jean-Baptiste Queru <jbq@google.com> 1258322754 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1258322754 -0800

merge from open-source master

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