BUG 1050343 Windows ZIP packages support (conflicts resolved); r=dustin

Conflicts:
	modules/packages/manifests/mozilla/mozilla_build.pp
	modules/packages/manifests/psutil.pp