Comment 59 for bug 261595

Now the tree is at least building partially, I've landed this:

https://hg.mozilla.org/comm-central/rev/a5e88cd9f942