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

[smilner]

Summary of changes:

  ccb6274... update for upstream release. see: http://www.djangoproject. (*)
  bbe8dcd... trying dirhtml as a replacement for djangohtml (*)
  a31a71b... updated build of docs for F12+ (*)
  453f644... forgot the actual source in sources (*)
  9322d96... removed the redundant dist check (*)
  8cd8cf2... Updated for upstream release (*)
  b854baa... Merge branch 'master' into el6

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