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

[smilner]

commit 69ec7f77278301b7d997b1735edd0e27e0300843
Merge: 9bd238c 8cd8cf2
Author: Steve Milner <stevem at gnulinux.net>
Date:   Mon Jan 3 11:23:29 2011 -0500

    Merge branch 'master' into f12

 .gitignore  |    2 ++
 Django.spec |   26 +++++++++++++++++++-------
 sources     |    3 ++-
 3 files changed, 23 insertions(+), 8 deletions(-)
---