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)
commitcf9b3c380fbef1ff10f5e40f22bb2d3ef436c077
tree7db18fdd8b52615799f02a433c07efe2b168189d
parentf15a82d411de4fa50262efa7d16e8b1d7f2b7886
Merge commit 'puzzle/development'

git-svn-id: https://svn/ipuppet/trunk/modules/munin@1863 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
files/plugins/xen_traffic_all