Index: django/db/models/base.py
===================================================================
--- django/db/models/base.py	(Revision 9014)
+++ django/db/models/base.py	(Arbeitskopie)
@@ -268,10 +268,11 @@
     def __repr__(self):
         return smart_str(u'<%s: %s>' % (self.__class__.__name__, unicode(self)))
 
+    def __unicode__(self):
+        return u'%s %s' % (self.__class__.__name__, self._get_pk_val())
+
     def __str__(self):
-        if hasattr(self, '__unicode__'):
-            return force_unicode(self).encode('utf-8')
-        return '%s object' % self.__class__.__name__
+        return force_unicode(self).encode('utf-8')
 
     def __eq__(self, other):
         return isinstance(other, self.__class__) and self._get_pk_val() == other._get_pk_val()