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

[smilner]

commit e8556f892d9a002cb74017a2b5f57f58a73c36d4
Merge: 87f34fd ccb6274
Author: Steve 'Ashcrow' Milner <me at stevemilner.org>
Date:   Mon Sep 13 14:08:50 2010 -0400

    Merge branch 'master' into f13

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