Bug 942164 - Fix merge error #2. a=bustage