[django-tracking/el5] (5 commits) ...Merge branch 'master' into el5

[Clint Savage]

Summary of changes:

  ef09d93... - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass (*)
  c814c78... updated sources (*)
  3fe9546... patch simplejson encoder issue (*)
  0a96f1c... updated spec to match new archive and requires (*)
  d4be1c8... Merge branch 'master' into el5

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