[python-dns/f12/master: 7/7] Merge branch 'master' into f12

[Jeffrey C. Ollie]

commit 0b6cef84559ff0ac77a570e40e8d4e5bd4d61793
Merge: 5279355 5a0206f
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Thu Aug 19 09:39:48 2010 -0500

    Merge branch 'master' into f12

 .gitignore                                         |    2 +-
 ...gorithm-was-being-passed-to-use_tsig-inco.patch |   36 ++++++++++++++
 python-dns.spec                                    |   49 +++++++++++++++++++-
 sources                                            |    3 +-
 4 files changed, 86 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 99674cc,f591382..2af5d08
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
- dnspython-1.7.1.tar.gz
+ dnspython-1.8.0.tar.gz
 -dnspython-1.8.0.tar.gz.asc