git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14980 bcc190cf-cafb-0310-a4f2-bffc1f526a37
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6843 bcc190cf-cafb-0310-a4f2-bffc1f526a37