[Django/el6/master] (13 commits) ...Merge branch 'master' into el6

[smilner]

Summary of changes:

  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 (*)
  d66aae6... Merge branch 'master' into el6

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