Index: django/forms/models.py
===================================================================
--- django/forms/models.py      (revision 8642)
+++ django/forms/models.py      (working copy)
@@ -117,6 +117,7 @@
                 data[f.name] = [obj.pk for obj in f.value_from_object(instance)]
         elif isinstance(f, OneToOneField):
             data[f.attname] = f.value_from_object(instance)
+            data[f.name] = data[f.attname]
         else:
             data[f.name] = f.value_from_object(instance)
     return data