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

[fenris02]

commit fbf811ae74cbee6a7914e8f4c2d8a6e82509d8e4
Merge: 8d15c30 cf5b632
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Thu Oct 18 21:49:37 2012 -0500

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

 munin.spec |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---