[Django/f12/master: 13/13] Merge branch 'master' into f12

[smilner]

commit aae72068b94bc2218b37be6ff1230988563e381e
Merge: d8740fd 7ff04c2
Author: Steve 'Ashcrow' Milner <me at stevemilner.org>
Date:   Thu Sep 9 11:07:55 2010 -0400

    Merge branch 'master' into f12

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