tree 7e8721c570174b26555593aa7f1d59288fd00c1b
parent c6137e7ca24c27ed07c962f629a3ee1a5cdc9b5d
parent e4c8fbf090ad14353992a377f54d18d4fca06838
author Jean-Baptiste Queru <jbq@google.com> 1258322805 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1258322805 -0800

merge from open-source master

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