merge from eclair master
authorJean-Baptiste Queru <jbq@google.com>
Sun, 15 Nov 2009 20:07:00 +0000 (12:07 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Sun, 15 Nov 2009 20:07:00 +0000 (12:07 -0800)
commitbb9dc6e1ac5e7ae0f12a8bb0aeb2a3b324328ec5
treeefc617bf851c98b42b699d414ee48831d26631b3
parentdbc76518512a1a5d8a0fe09e20e5aac692fd9ac4
parentcf79a11f9fee88daf48aa71b1d521fc5e07bf839
merge from eclair