merge from eclair
Jean-Baptiste Queru [Sun, 15 Nov 2009 20:06:44 +0000 (12:06 -0800)]

Trivial merge