Comment 31 for bug 439783

I feel funny doing it since this bug report is older, but #629258 is firmly settled in and this tangle of bug reports has to be made sane somehow. This way we won't lose any patches as they arise.

I think it makes the most sense to make that one the master. Feel free to unduplicate if I've made a mistake. I won't be upset :)