2014-07-25 - releng
09:45	<mwalker>	rebasing puppet repo to get a ocg patch	[releng]