Thanks to David Fischer and Eric Holscher for their work on initial patches.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13138 bcc190cf-cafb-0310-a4f2-bffc1f526a37