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)
commitb4f48334291ec004d643b61427396acae62ab296
tree7db18fdd8b52615799f02a433c07efe2b168189d
parent5f9c7472f704104561597ab75a9f591a61f7b672
parent2de5b80d2686711e0d7b0d8aabee6e14919709af
Merge commit 'puzzle/development'

git-svn-id: https://rfd.cronopios.org/ipuppet/trunk/modules/munin@1863 d66ca3ae-40d7-4aa7-90d4-87d79ca94279