2011-10-07 - production
14:58	<mark>	Merged lots of puppet changes, gonna hide now	[production]