tree cfbac5189d983a7c7d05539fc972a86738d4ebe1
parent 60a4c356ee9ce5e9ccb23347c0381f0436192691
parent 0d518a3791c43557149f1b401ef86b436176c1aa
author Jean-Baptiste Queru <jbq@google.com> 1258322773 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1258322773 -0800

merge from open-source master

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