[python-lxml/f13/master: 8/8] Merge branch 'master' into f13

[Jeffrey C. Ollie]

commit fa1327fa2fd40d8f3f3b79dc320bfee652c561de
Merge: a01f3e2 4b6102e
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Fri Aug 6 08:47:00 2010 -0500

    Merge branch 'master' into f13

 .gitignore                       |    2 ++
 python-lxml-2.2.6-fix-2to3.patch |   13 +++++++++++++
 python-lxml.spec                 |   24 +++++++++++++++++++++++-
 sources                          |    4 ++--
 4 files changed, 40 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index b97e9bd,e1bee74..8e96852
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,2 +1,4 @@@
 +lxml-2.2.6.tar.gz
 +lxml-2.2.6.tar.gz.asc
+ lxml-2.2.7.tar.gz
+ lxml-2.2.7.tar.gz.asc