2014-09-29 - releng
08:57	<hashar>	rebased puppetmaster	[releng]