[python-djblets/el6: 3/3] Merge branch 'master' into el6

[Stephen Gallagher]

commit 3a756a7458db26a275480d38fd70527510f8512c
Merge: 9fa7c7b dce702b
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Tue Jul 31 09:30:06 2012 -0400

    Merge branch 'master' into el6

 .gitignore                                         |    1 +
 0001-Conditionalize-ez_setup.patch                 |   41 ++++++++++++++++++++
 ...1-Disable-ez_setup-when-installing-by-RPM.patch |   26 ------------
 python-djblets.spec                                |   24 ++++++++++-
 sources                                            |    2 +-
 5 files changed, 64 insertions(+), 30 deletions(-)
---