tree 7fd574307953a0bbde499194ab4006a7cae3f8b9
parent d641a0e1413f4db37016d4fc1d1418320d9464f2
parent b2ce982d432338d36a41bd57e35a14459fc3d30b
author Jean-Baptiste Queru <jbq@google.com> 1258322755 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1258322755 -0800

merge from open-source master

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