2014-08-08 - releng
16:05	<bd808>	Fixed merge conflict that was preventing updates on puppet master	[releng]