[Django/f13/master: 10/10] Merge branch 'master' into f13

[smilner]

commit d597100288edc68a17478539d8b509cb16b15214
Merge: bca36e8 7ff04c2
Author: Steve 'Ashcrow' Milner <me at stevemilner.org>
Date:   Thu Sep 9 10:39:39 2010 -0400

    Merge branch 'master' into f13

 .gitignore  |    2 ++
 Django.spec |   11 +++++++++--
 sources     |    4 ++--
 3 files changed, 13 insertions(+), 4 deletions(-)
---