tree a2e42e33ca1c1948e1fb20a74547284e03899124
parent 58c35fd8e8d71912c64cb55d6e27df50dde65f76
parent 326aed4d218c75815abf7038bc4e6c349d899bae
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