tree c42229a7ae0f2fa7981f8a2fcedff9bbc0272e9f
parent 6e6287e559477568ed0dbdf505de8ddc925bb956
parent c2fd66b2385511a841dfe0a6769514f86bdfab32
author Jean-Baptiste Queru <jbq@google.com> 1258322764 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1258322764 -0800

merge from open-source master

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