s
Merge branch 'master' of github.com:bergamut/puppet into test