[python-djblets/el5: 5/5] Merge branch 'master' into el5

[Stephen Gallagher]

commit 63485539d85612e6e8f6b1b528b1fe82071a8603
Merge: 63f744c 99d383f
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Mon Aug 22 10:17:17 2011 -0400

    Merge branch 'master' into el5

 .gitignore          |    3 +++
 python-djblets.spec |   38 ++++++++++++++++++++++++++++++++++++--
 sources             |    2 +-
 3 files changed, 40 insertions(+), 3 deletions(-)
---