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

[fenris02]

commit f39d8b1644a625e1876ef4d3766352e35b9d6f9c
Merge: f526152 6763941
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Sun Aug 19 22:38:50 2012 -0500

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

 munin.spec |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
---