Bug 1020614 - Fix breakage in b2g;r=me