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

[Stephen Gallagher]

commit 54b3eb3c29da03c79f0ced55d7b62e73cb108380
Merge: 294475c 54db2bb
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Mon Jan 10 11:37:31 2011 -0500

    Merge branch 'master' into el6

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