tree 242917d13f3614f94d07a4de2265c4a21660e269
parent 9610ccefbbddcf008af9fd622f89b3621b5e3720
parent 596dd9f8bd1a257af4826b8333a61e61b9c070e1
author Jean-Baptiste Queru <jbq@google.com> 1258322763 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1258322763 -0800

merge from open-source master

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