[python-openid/f13/master: 4/4] Merge branch 'master' into f13

[Jeffrey C. Ollie]

commit f66efa718798b8c9047313f1468b7ea5c0b06950
Merge: ec6bf02 6bff0fe
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Mon Aug 9 21:51:19 2010 -0500

    Merge branch 'master' into f13

 .gitignore         |    1 +
 python-openid.spec |   21 +++++++++++++++------
 sources            |    2 +-
 3 files changed, 17 insertions(+), 7 deletions(-)
---