2012-01-04 - production
07:40	<Tim>	fixed puppet by re-running the post-merge hook with key forwarding enabled, and then started puppet on ms6	[production]