[python-repoze-who-testutil/el5: 10/10] Merge branch 'master' into el5

[Luke Macken]

commit f9d2bee7090ce4d3117ac94ccef65a80398276b1
Merge: c594452 3e278b9
Author: Luke Macken <lmacken at redhat.com>
Date:   Wed Dec 14 15:16:55 2011 -0500

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	python-repoze-who-testutil.spec
    	sources

 .gitignore                      |    2 +-
 python-repoze-who-testutil.spec |   42 ++++++++++++++++++++++++--------------
 sources                         |    2 +-
 3 files changed, 28 insertions(+), 18 deletions(-)
---
diff --cc .gitignore
index cb48a57,c885cad..7185766
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--repoze.who-testutil-1.0.tar.gz
+ /repoze.who-testutil-1.0.1.tar.gz