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

[fenris02]

commit a776b7e6c1b8a3e48308eea37f4cce3e2c4e9635
Merge: f2e9867 91ff89d
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Wed Jan 9 11:44:11 2013 -0600

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

 .gitignore                    |    1 +
 munin-2.0.10.tar.gz.sha256sum |    1 +
 munin-2.0.9.tar.gz.sha256sum  |    1 -
 munin.spec                    |   21 ++++++++++++++-------
 sources                       |    2 +-
 5 files changed, 17 insertions(+), 9 deletions(-)
---