Debugging.
Merge branch 'master' of github.com:lavere/ZendServerPuppet

Conflicts:
	manifests/init.pp