[full-history]: Merged revisions 3642-4724 via svnmerge from http://code.djangoproject.com/svn/django/trunk