Just running up the commit count in less destructive ways than jacob. Move along.

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