tree 6c463580fbac9017f7e5e48829f8fbee20c15446
parent 58cfb698ffb85d390c5930ce979dc43727a47dc0
parent 29c5f7092a16d0462e3cf5cc244ece3244dc67f4
author Jean-Baptiste Queru <jbq@google.com> 1258322809 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1258322809 -0800

merge from open-source master

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