[munin: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/munin

[fenris02]

commit 12bcafcf4f5f6e3a1d9d661411e29c116bae1c8c
Merge: fc4a6cf f90fcfa
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Sun Jul 15 22:02:45 2012 -0500

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/munin
    
    Conflicts:
    	munin.spec

---