I fixed this upstream already (see also bug 945592), but after the 2.10 release. I'll discuss with upstream if we'll do a 2.10.1 release soon, or if I have to backport some patches ;-)