2014-12-04 - releng
22:48	<YuviPanda>	manually rebased puppet on deployment-prep	[releng]