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

[Stephen Gallagher]

commit a8d30efe5149a3caa5dcc72891c58bc537e7c277
Merge: 3cdd21a 891ce06
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Tue Jan 18 08:48:51 2011 -0500

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

 ...WSGI-users-that-config-changes-are-needed.patch |   43 ++++++++++++++++----
 ReviewBoard.spec                                   |   16 ++++++-
 2 files changed, 49 insertions(+), 10 deletions(-)
---