[python-lxml/f12/master: 14/14] Merge branch 'master' into f12

[Jeffrey C. Ollie]

commit d9c1c19e88ed40205a6223702a405e84380954f5
Merge: 5c5fadc 4b6102e
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Fri Aug 6 08:39:04 2010 -0500

    Merge branch 'master' into f12

 .gitignore                       |    2 ++
 python-lxml-2.2.6-fix-2to3.patch |   13 +++++++++++++
 python-lxml.spec                 |   31 ++++++++++++++++++++++++++++++-
 sources                          |    4 ++--
 4 files changed, 47 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index e265ce7,e1bee74..7c32f6c
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,2 +1,4 @@@
 +lxml-2.2.5.tar.gz
 +lxml-2.2.5.tar.gz.asc
+ lxml-2.2.7.tar.gz
+ lxml-2.2.7.tar.gz.asc