merge from eclair master
authorJean-Baptiste Queru <jbq@google.com>
Sun, 15 Nov 2009 20:06:53 +0000 (12:06 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Sun, 15 Nov 2009 20:06:53 +0000 (12:06 -0800)
commit89e035ed1e90c5b86c57dab9e403399cbf6ede38
treeff36bd6742cd1dd913fc14ed81deacc4f4f5b604
parent42048b6b9b10c9606377f32681c672aaa8c8c5c0
parent35f6eb278f4b7ca73055e3008791fd2eee05e2d9
merge from eclair