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

[fenris02]

commit dbd44784e1057c3f77f11f56798434e534c480bc
Merge: fbf811a 76c647f
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Fri Oct 19 21:01:16 2012 -0500

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

 munin-2.0-defect-1213.patch |   22 ++++++++++++++++++++++
 munin.spec                  |   34 +++++++++++++++++++++-------------
 2 files changed, 43 insertions(+), 13 deletions(-)
---