[python-openid/f12/master: 6/6] Merge branch 'master' into f12

[Jeffrey C. Ollie]

commit 56406f436cb915672fcf7eedbea8014ab2fe46a9
Merge: 76b9dca 6bff0fe
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Mon Aug 9 22:06:42 2010 -0500

    Merge branch 'master' into f12

 .gitignore         |    1 +
 python-openid.spec |   26 +++++++++++++++++++-------
 sources            |    2 +-
 3 files changed, 21 insertions(+), 8 deletions(-)
---
diff --cc .gitignore
index b052b61,ad8b622..1d1b930
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,2 @@@
 -python-openid-2.2.4.tar.bz2
 +python-openid-2.2.1.tar.bz2
+ openid-python-openid-2.2.5-0-gb666238.tar.gz