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

[fenris02]

commit 92b3226ab9c32a95ccfb1ce1bf61687130787e63
Merge: 9b94d60 91ff89d
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Wed Jan 9 11:43:58 2013 -0600

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

 .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(-)
---