tree 0fb281d1f2c9b5983c59359c272e6eb8cf4826b5
parent b729b266d2eda5ddc8ccbe65ca7e60304e502780
parent ea815d93086e3d6d743c1d22fb7e83fb4d41c32a
author Jean-Baptiste Queru <jbq@google.com> 1258322765 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1258322765 -0800

merge from open-source master

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