Comment 7 for bug 1081576

Thanks for testing Pasi! I've picked this to master, rel_2_4, rel_2_3. Also rel_2_2, though that required a tiny bit of massaging since the code there is slightly different due to xulrunner differences between branches.