Comment 17 for bug 904072

I'm split, I fear we'll have to communicate the testfix.patch downstream as well, even if it makes a bit of a giant patch. Separating them should make it quite clear that the fix is simple.

@Vish: could you attach updated patches (fix.patch + testfix.patch) that I can use in the downstream announcement ?