merging lp:~clint-fewbar/charms/precise/puppetmaster/trunk before fixing promulgation error
maintainer change