2014-09-28 - releng
14:38	<andrewbogott>	edited and re-cherry-picked roan's citoid patch into beta because the previous version was breaking puppet	[releng]