[python-dns/el5/master: 4/7] Merge remote branch 'origin/master' into el5

[Jeffrey C. Ollie]

commit 0a006699a296d78f0e9aeb179643fc1643d85ecc
Merge: 8d2def2 dabb91e
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Thu Dec 2 10:25:01 2010 -0600

    Merge remote branch 'origin/master' into el5

 .gitignore                                         |    4 +
 ...gorithm-was-being-passed-to-use_tsig-inco.patch |   36 ------------
 python-dns.spec                                    |   61 ++++++++++++++++++-
 sources                                            |    4 +-
 4 files changed, 63 insertions(+), 42 deletions(-)
---