2011-05-10 - production
13:10	<Tim>	did the above in both puppet and nagios directly since puppet seems to be still broken	[production]