tree f7699cbb9a798281b3558f7e9588fd6d418a7a39
parent 40c6c6704489593564bd9fbb7acba8ecd6c007f4
parent 7ba6ccfe3fbaa3e1099e3ce6cb052878e82c4b31
author Jean-Baptiste Queru <jbq@google.com> 1258322782 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1258322782 -0800

merge from open-source master

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