[munin/f17: 2/2] Merge remote-tracking branch 'origin/master' into f17

[fenris02]

commit a88d9056c83b65ebca36b22e4ac53e9bb16c132a
Merge: a1c9788 4b5cfef
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Sat Sep 8 01:13:53 2012 -0500

    Merge remote-tracking branch 'origin/master' into f17

 munin-2.0.6-OS.pm.7f32c59.patch |   10 ++++++++++
 munin.spec                      |   14 ++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)
---