Bug 851230 - Framed plain text documents should not have word wrap applied. r=bz
Bug 850441 - Allow BlockOnload/UnblockOnload from both the current and pending request. r=khuey

--HG--
extra : rebase_source : cd7bdc9f91b478be60fed5572dc8ee5e3faae380
Bug 852413 - Make test_image_layers.html wait for its image to load.  r=mattwoodrow

--HG--
extra : rebase_source : 8be901e5932e8779bfcc4077de0108fd36acc6ec