tree 7b1a32d3be4e54b0b0196a86c3a11ea9df51e0f8
parent 25812d8c5e2627d2459704fb05e984b1bd73ebdc
parent 272f281c600f77e06b2eb68030d9cfa91e3d9a0d
author Jean-Baptiste Queru <jbq@google.com> 1258322810 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1258322810 -0800

merge from open-source master

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