[ReviewBoard/el5/master: 3/3] Merge branch 'master' into el5

[Stephen Gallagher]

commit 3cdd21a95cabcea6059c479889e7be29fb569a5c
Merge: 3a1504a c0223fa
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Mon Jan 10 11:41:56 2011 -0500

    Merge branch 'master' into el5
    
    Conflicts:
    	ReviewBoard.spec

 .gitignore                                         |    1 +
 ...WSGI-users-that-config-changes-are-needed.patch |   27 ++++++++
 ReviewBoard.spec                                   |   64 +++++++++++++++++--
 sources                                            |    2 +-
 4 files changed, 86 insertions(+), 8 deletions(-)
---