Bug 1082734 - Bustage follow-up. r=bz, a=bustage

--HG--
extra : amend_source : e03b9b50f3a45ce2f9e29ba0da3594f5803a8418