[nsd/f17: 6/6] Merge branch 'master' into f17

[Paul Wouters]

commit dcb097e785fbc546563770f4f887d85b95cca181
Merge: f45cc4b 19f94a3
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri Nov 23 15:28:16 2012 -0500

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	nsd.spec
    	sources

 .gitignore        |    1 +
 nsd.spec          |    8 +++++++-
 sources           |    4 +---
 tmpfiles-nsd.conf |    2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)
---