2014-04-16 - releng
09:33	<hashar>	rebased puppetmaster	[releng]