tree a661f976a180c2a9d8ebccd632f1c68dbf711ebd
parent 8e44e27ed09af97ce989d02dcb601b56e7dc18a7
parent c4ba8f5766658fedec1e3a9efd6df856389f70aa
author Jean-Baptiste Queru <jbq@google.com> 1258322607 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1258322607 -0800

merge from open-source master

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