Summary of changes: 1c1d31b... Fix conflict with Django 1.4 (*) 0784bd0... Fix typo (*) 950485c... New upstream release 1.6.7 (*) 157d491... Merge branch 'master' into el6 (*) This commit already existed in another branch; no separate mail sent