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

[smilner]

commit 9bd238c9a26819b63d8dd974dbecef821ac953bd
Merge: aae7206 ccb6274
Author: Steve 'Ashcrow' Milner <me at stevemilner.org>
Date:   Mon Sep 13 14:29:27 2010 -0400

    Merge branch 'master' into f12

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