[pdns/f13/master: 3/3] Merge branch 'master' into f13

[Ruben Kerkhof]

commit 7bdd9792929d57aeac16048795e3b523afd12d80
Merge: a507d31 a09b593
Author: Ruben <ruben at rubenkerkhof.com>
Date:   Tue Dec 14 19:03:10 2010 +0100

    Merge branch 'master' into f13

 pdns-fix-crash-on-sigstop.patch |   16 ++++++++++++++++
 pdns.spec                       |    7 ++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
---