[Django/el5/master: 41/41] Merge branch 'master' into el5

[smilner]

commit a25c423e129c8d48c11f4eca528d05cbae5daff7
Merge: c7a88f1 7ff04c2
Author: Steve 'Ashcrow' Milner <me at stevemilner.org>
Date:   Thu Sep 9 11:21:07 2010 -0400

    Merge branch 'master' into el5

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