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

[Stephen Gallagher]

commit 4d2091b34b0f9023830f9f82efe88151f5ace10d
Merge: 7a96e5e d16bf07
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Tue Jul 31 09:50:39 2012 -0400

    Merge branch 'master' into el6

 .gitignore                                         |    1 +
 ...1-Disable-ez_setup-when-installing-by-RPM.patch |   27 -----------
 ReviewBoard.spec                                   |   49 +++++++++++++++++--
 sources                                            |    2 +-
 4 files changed, 45 insertions(+), 34 deletions(-)
---