Comment 4 for bug 1186558

Jeremy, your changelog snippet suggest you got that merge done somewhere, can you share it (the bug has no vcs, ppa or diff,