tree f77f26e42117df22de602dc695dfd9e3541bc11c
parent baf21439df7b4e641dfa990f12c287dc53c40f09
parent 410c0077b01c19b5d1269205ac5bb740939a0d38
author Jean-Baptiste Queru <jbq@google.com> 1258322793 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1258322793 -0800

merge from open-source master

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