git-svn-id: http://code.djangoproject.com/svn/django/trunk@13122 bcc190cf-cafb-0310-a4f2-bffc1f526a37
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13052 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Thanks to Marc Garcia for working on this during his Google Summer of Code 2009! Additionally fixes #1061, #2203, #3940, #5526, #6449, #6231, #6693, #6783, #9366 and #10891. git-svn-id: http://code.djangoproject.com/svn/django/trunk@11964 bcc190cf-cafb-0310-a4f2-bffc1f526a37