tree 2cf361b308f14d09ff39c755302376059c232bfb
parent d6eeae3f5dd027a2d4e6b702cc07db4a605848c0
parent b088e0b51cccd0c6c67115c351f99311c668ee32
author Jean-Baptiste Queru <jbq@google.com> 1258322776 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1258322776 -0800

merge from open-source master

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