tree 7aea7b559099a4f01a121e2d53a438fdaccf4168
parent 354426713488ecc54330d1eae8c420249b8d5cc1
parent 4ede0ae3b6f685482036f360e319a511b4b0dd75
author Jean-Baptiste Queru <jbq@google.com> 1258322780 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1258322780 -0800

merge from open-source master

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