Fix bustage from bad merge of patches for bug 1029104. r=bustage.

--HG--
extra : rebase_source : f08d6d25ea8d6bb063f9f947f096faad7474dd22
Bug 1015339 - Spot fix FormatStackDump. (r=bz)