[opendnssec/f18: 10/10] Merge branch 'master' into f18

[Paul Wouters]

commit c54ce2de82d315eb87c91922c2b338d0cefa6f67
Merge: 5ef211d c9c32af
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri Jan 25 13:03:31 2013 -0500

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	opendnssec.spec
    	sources

 .gitignore      |    4 +---
 opendnssec.spec |   24 ++++++++++++++++++------
 sources         |    2 +-
 3 files changed, 20 insertions(+), 10 deletions(-)
---