merge from open-source master
authorJean-Baptiste Queru <jbq@google.com>
Sun, 15 Nov 2009 22:06:03 +0000 (14:06 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Sun, 15 Nov 2009 22:06:03 +0000 (14:06 -0800)
commitc485e4b98e33a71ff56c120a52f10b1719ecbe1c
tree242917d13f3614f94d07a4de2265c4a21660e269
parent9610ccefbbddcf008af9fd622f89b3621b5e3720
parent596dd9f8bd1a257af4826b8333a61e61b9c070e1
merge from open-source master

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