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