merge from eclair
authorJean-Baptiste Queru <jbq@google.com>
Sun, 15 Nov 2009 20:05:45 +0000 (12:05 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Sun, 15 Nov 2009 20:05:45 +0000 (12:05 -0800)
commit596dd9f8bd1a257af4826b8333a61e61b9c070e1
tree242917d13f3614f94d07a4de2265c4a21660e269
parent9610ccefbbddcf008af9fd622f89b3621b5e3720
parentf955d1799555c6db796756856982e3138d1cf4d1
merge from eclair