tree 69dcac174d58dacb62573aee90adbfc278e5f68e
parent 1b2d5b424d2010a42a8a012fcc3ac9f0a73d0f79
parent ed49e6be0c0b1ad83dc6965a6dd3d293fe05b9ff
author Jean-Baptiste Queru <jbq@google.com> 1258322812 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1258322812 -0800

merge from open-source master

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