BUG 1048962 Custom resource packages::pkgzip; r=dustin
BUG 1050343 Windows ZIP packages support (conflicts resolved); r=dustin

Conflicts:
	modules/packages/manifests/mozilla/mozilla_build.pp
	modules/packages/manifests/psutil.pp
Merge default -> production

--HG--
branch : production