[Django/el4/master: 62/62] Merge branch 'el5' into el4

[smilner]

commit 071b85064d21004758de982864bbe0c51a5aee87
Merge: b765161 8ee3d43
Author: Steve Milner <stevem at gnulinux.net>
Date:   Mon Jan 3 12:49:02 2011 -0500

    Merge branch 'el5' into el4

 .gitignore  |    8 ++++-
 Django.spec |   74 +++++++++++++++++++++++++++++++++++++++++++++++-----------
 sources     |    2 +-
 3 files changed, 67 insertions(+), 17 deletions(-)
---