- merged bump-nss-req patch from icedove