dfbvdv
Merge branch 'zpi-pci-3817' of github.com:zdenekpizl/munin-graphite into zpi-pci-3817

Conflicts:
	m2g_getconfig.py
sdlkfghjd