Merge commit 'puzzle/development'
authormh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Thu, 17 Jul 2008 12:58:47 +0000 (12:58 +0000)
committermh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Thu, 17 Jul 2008 12:58:47 +0000 (12:58 +0000)
git-svn-id: https://rfd.cronopios.org/ipuppet/trunk/modules/munin@1863 d66ca3ae-40d7-4aa7-90d4-87d79ca94279


Trivial merge