merge from eclair master
authorJean-Baptiste Queru <jbq@google.com>
Sun, 15 Nov 2009 20:06:01 +0000 (12:06 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Sun, 15 Nov 2009 20:06:01 +0000 (12:06 -0800)
commita9986ffe3a5ad3d43d7469258e1e1bcc2fac5bee
treeb321622187db63fbd219e5cb83c0006afcaf88be
parent1d07e4cb6f77c0c1994229aa39e978bd3d64ab71
parentc71a01869f6c9f0fab8d15b780e886be65daf024
merge from eclair