Index: contrib/admin/views/main.py
===================================================================
--- contrib/admin/views/main.py	(revision 7450)
+++ contrib/admin/views/main.py	(working copy)
@@ -57,7 +57,9 @@
     quoting is slightly different so that it doesn't get automatically
     unquoted by the Web browser.
     """
-    if type(s) != type(''):
+    if type(s) == type(''):
+        s = unicode(s)
+    if type(s) != type(u''):
         return s
     res = list(s)
     for i in range(len(res)):