bug 984364: assert facts about puppetmasters and foopies, r=dustin
bug 1046749: create signing servers for v2 mac signing. r=dustin
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
No Bug - Add jabba to SeaMonkey's authorized users list. stamp=dustin
Bug 1050522: updated build script for nrpe-2.14-moz1; r=bhearsum
No bug: make ix1204-5 a server so it gets keys; a=orgonly
Merge branch 'master' into unzip