newforms-admin: Merged to [6612]

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

1 files changed, 1 insertions, 1 deletions

diff --git a/django/utils/encoding.py b/django/utils/encoding.py
index 6daae4386d..2bd1ef6563 100644
--- a/django/utils/encoding.py
+++ b/django/utils/encoding.py
@@ -31,7 +31,7 @@ def force_unicode(s, encoding='utf-8', strings_only=False, errors='strict'):
 
     If strings_only is True, don't convert (some) non-string-like objects.
     """
-    if strings_only and isinstance(s, (types.NoneType, int, long, datetime.datetime, datetime.time, float)):
+    if strings_only and isinstance(s, (types.NoneType, int, long, datetime.datetime, datetime.date, datetime.time, float)):
         return s
     if not isinstance(s, basestring,):
         if hasattr(s, '__unicode__'):