Bug 982974 - Last bit of trunk fixup.  r=sfink, r=nmatsakis

--HG--
extra : rebase_source : 8d4800943708f39dcd04d499224cd76ac9194ec7