Bug 978639 - Filly rebase error. a=bustage

--HG--
extra : rebase_source : 0a5b50b3045595174f00916f8521fb8d10f61e1c