[rbldnsd/el6: 6/6] Merge branch 'master' into el6

[Paul Howarth]

commit 3dc535f2ab70420bbb6844faadc55e5772eae69e
Merge: 9eafc8a ddfb862
Author: Paul Howarth <paul at city-fan.org>
Date:   Mon Apr 16 17:48:11 2012 +0100

    Merge branch 'master' into el6

 rbldnsd.init |    5 +++--
 rbldnsd.spec |   51 +++++++++++++++++++++++++++++++++------------------
 2 files changed, 36 insertions(+), 20 deletions(-)
---