Merge pull request #2 from munin-monitoring/master

merge in changes