Bug 917685 - Catch error thrown by nsILoadContext.associatedWindow; r=mfinkle
Bug 917685 - Let complex overrides take precedence over pref overrides; r=dao
Automatic merge