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

[fenris02]

commit cfad5c076984a45b3c34daa9c85ed69621592461
Merge: 781f745 f4fff2d
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Tue Aug 14 13:39:56 2012 -0500

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

 .gitignore                   |    1 +
 acpi-2.0.5.patch             |   11 +++++++++++
 munin-2.0.4.tar.gz.sha256sum |    1 -
 munin-2.0.5.tar.gz.sha256sum |    1 +
 munin.spec                   |   10 ++++++++--
 sources                      |    2 +-
 6 files changed, 22 insertions(+), 4 deletions(-)
---