[ldns/f18: 4/4] Merge branch 'master' into f18

[Paul Wouters]

commit 0b8b77e295c4d628d7bf67365f0d0b1e4df41381
Merge: 5b40234 1ecd572
Author: Paul Wouters <paul at nohats.ca>
Date:   Fri Oct 26 09:06:13 2012 -0400

    Merge branch 'master' into f18
    
    Conflicts:
    	ldns.spec
    	sources

 ldns.spec |    1 +
 sources   |    2 --
 2 files changed, 1 insertions(+), 2 deletions(-)
---