newforms-admin: Merged to [6458]

git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@6459 bcc190cf-cafb-0310-a4f2-bffc1f526a37

tests/modeltests/basic/models.py

@@ -152,7 +152,7 @@ TypeError: 'foo' is an invalid keyword argument for this function
 >>> a6 = Article(pub_date=datetime(2005, 7, 31))
 >>> a6.save()
 >>> a6.headline
-'Default headline'
+u'Default headline'
 
 # For DateTimeFields, Django saves as much precision (in seconds) as you
 # give it.