Index: /store/django/tests/modeltests/manipulators/models.py
===================================================================
--- /store/django/tests/modeltests/manipulators/models.py	(revision 3508)
+++ /store/django/tests/modeltests/manipulators/models.py	(working copy)
@@ -21,6 +21,43 @@
     def __str__(self):
         return self.name
 
+
+class Message(models.Model):
+    message = models.TextField()
+    class Meta:
+        pass
+    class Admin:
+        pass
+
+class Translation(models.Model):
+    message = models.ForeignKey(Message, edit_inline=models.TABULAR)
+    language = models.CharField(maxlength=10)
+    translation = models.TextField(core=True)
+    
+    class Meta:
+        unique_together = (('language', 'message',),)
+    class Admin:
+        pass
+
+class Message2(models.Model):
+    message = models.TextField()
+    class Meta:
+        pass
+    class Admin:
+        pass
+    
+class Registry(models.Model):
+    """ this model breaks Message """
+    message = models.ForeignKey(Message2, edit_inline=True)
+    obj = models.CharField(maxlength=255, core=True)
+    field = models.CharField(maxlength=255)
+    
+    class Meta:
+        unique_together = (('field', 'obj'),)
+    class Admin:
+        pass
+
+
 API_TESTS = """
 >>> from django.utils.datastructures import MultiValueDict
 
@@ -88,4 +125,10 @@
 <Album: Ultimate Ella>
 >>> a2.release_date
 datetime.date(2005, 2, 13)
+
+# Exception when using unique_together in edit_inline model -- ticket #526
+>>> t = Message2.AddManipulator()
+
+# another problem, unique_together order is important, this fails when first field is not FK
+>>> t = Message.AddManipulator()
 """