[Django/el5/master] (41 commits) ...Merge branch 'master' into el5

[smilner]

Summary of changes:

  2ac3739... Rebuild for development's Python 2.5 (*)
  5954567... Add missing BR on python-devel (*)
  a3175a3... Bump up release number (*)
  3874d96... Upstream security update: Django-0.95.1 (*)
  766c869... Re-add python-devel BR on development branch (*)
  0c6266e... Django 0.96 for Rawhide (*)
  3535fb4... Security update for i18n vulnerability (*)
  49fc697... Package egginfo file on Fedora >= 9 (*)
  267357a... Django-0.96.2: XSS security update (bz# 447257-60) (*)
  8619a2c... - Update to 1.0 beta1 (*)
  3c98847... - Update to 1.0 beta2 (*)
  8d58ed1... - CSRF security update: bz#460966 (*)
  826134e... - Update to final 1.0 release (*)
  c0ad3a6... Rebuild for Python 2.6 (*)
  bad5374... - Update to 1.0.2 (*)
  2d8ccba... - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass (*)
  c354bc9... - Build HTML documentation (bug #484070) (*)
  481a358... - Build HTML documentation (bug #484070) - No longer exclud (*)
  6878986... - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass (*)
  fa799f8... Update for 1.0.3 security release. (*)
  3ba2364... Fixed changelog (oops). (*)
  778effa... Unifed django spec (via mockbuild) (*)
  f3d5714... Updates for Django-1.1. (*)
  026e394... applied patch for Django in rawhide (*)
  9fc8327... moved if to fedora 9 and lower (*)
  92b6e1d... EL4 can't build with sphinx (*)
  b5dae00... testing combined spec in devel (*)
  cce79fc... spec worked in el4 and in devel (*)
  f9ffe22... proposed update for fix for     http://www.djangoproject.co (*)
  8b60a79... Updated spec to fix BZ#529188. (*)
  c8af6a8... Fix typo that causes a failure to update the common directo (*)
  0d22fe0... updated for version 1.2 (*)
  70763fe... updated for 1.2.1 release (*)
  0c77263... updated for 1.2.1 release (*)
  6e732bd... - Use generated %{name}.lang instead of including each loca (*)
  a67f8e4... update spec for building on EL-6 as well (*)
  dd8752b... added patch from BZ601212 (*)
  c5d3a52... - Rebuilt for     https://fedoraproject.org/wiki/Features/P (*)
  9a0e1b0... dist-git conversion (*)
  7ff04c2... update for CVE-2010-3082 (*)
  a25c423... Merge branch 'master' into el5

(*) This commit already existed in another branch; no separate mail sent