Fixed #1394 -- Fixed an admin crash when saving models with pk db col…

…umn != pk attname.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@6360 bcc190cf-cafb-0310-a4f2-bffc1f526a37

django/contrib/admin/views/main.py

@@ -140,7 +140,7 @@ def __init__(self, field, field_mapping, original):
 
     def original_value(self):
         if self.original:
-            return self.original.__dict__[self.field.column]
+            return self.original.__dict__[self.field.attname]
 
     def existing_display(self):
         try: