Bug 1040819, 1040822: remove copy/pasted comment; a=NPOTB
Bug 1009584 - buildbot packages version 0.8.4-pre-moz4 was needed to include patch referenced in 961075. r=dustin
Merge default -> production

--HG--
branch : production