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

[Paul Wouters]

commit 49005726aa581c1735a191a4484ecbbcb8ee789d
Merge: c54ce2d 53fe968
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Apr 16 10:01:59 2013 -0400

    Merge branch 'master' into f18

 .gitignore      |    1 +
 opendnssec.spec |   13 +++++++++++--
 sources         |    2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)
---