[Django/el6/master: 7/7] Merge branch 'master' into el6

[smilner]

commit b854baa81bbd3bfcdb14d091e363c889cb0e41f0
Merge: d66aae6 8cd8cf2
Author: Steve Milner <stevem at gnulinux.net>
Date:   Mon Jan 3 11:36:08 2011 -0500

    Merge branch 'master' into el6

 .gitignore  |    3 +++
 Django.spec |   29 ++++++++++++++++++++++-------
 sources     |    3 ++-
 3 files changed, 27 insertions(+), 8 deletions(-)
---