[rbldnsd/el5: 17/17] Merge branch 'master' into el5

[Paul Howarth]

commit 2c722364b32d57f7bed5e612397f19b41df97455
Merge: 9dc8e58 3dc535f
Author: Paul Howarth <paul at city-fan.org>
Date:   Mon Apr 16 18:00:39 2012 +0100

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	rbldnsd.spec

 .gitignore   |    2 +-
 rbldnsd.init |   70 +++++++++++++++++++++++++++-------
 rbldnsd.spec |  118 +++++++++++++++++++++++++++++++++++++++-------------------
 sources      |    2 +-
 4 files changed, 138 insertions(+), 54 deletions(-)
---