Merge branch 'master' of git://git.puppet.immerda.ch/module-munin
authorJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Thu, 13 May 2010 18:09:55 +0000 (14:09 -0400)
committerJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Thu, 13 May 2010 18:09:55 +0000 (14:09 -0400)

Trivial merge