[Django/f13/master] (10 commits) ...Merge branch 'master' into f13

[smilner]

Summary of changes:

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

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