can't be used as bytestrings.

Still a number of markup changes to be made in this file (and in this
changeset). That's intentional for now, since I'm going to rewrite the file
later this week.


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