Index: trunk/packages/sipb-xen-database/sipb_xen_database/models.py
===================================================================
--- trunk/packages/sipb-xen-database/sipb_xen_database/models.py	(revision 588)
+++ trunk/packages/sipb-xen-database/sipb_xen_database/models.py	(revision 589)
@@ -104,5 +104,5 @@
                           'disks': relation(Disk, backref="machine", lazy=False),
                           'type': relation(Type, lazy=False),
-                          'acl': relation(MachineAccess, backref="machine", lazy=False)});
+                          'acl': relation(MachineAccess, backref="machine", lazy=False, private=True)});
 assign_mapper(ctx, MachineAccess, machine_access_table)
 assign_mapper(ctx, NIC, nic_table)
Index: trunk/packages/sipb-xen-www/code/cache_acls.py
===================================================================
--- trunk/packages/sipb-xen-www/code/cache_acls.py	(revision 588)
+++ trunk/packages/sipb-xen-www/code/cache_acls.py	(revision 589)
@@ -47,5 +47,6 @@
         ctx.current.delete(ma)
     for p in people - old_people:
-        ma = MachineAccess(machine_id=m.machine_id, user=p)
+        ma = MachineAccess(user=p)
+        m.acl.append(ma)
         ctx.current.save(ma)
     
Index: trunk/packages/sipb-xen-www/code/controls.py
===================================================================
--- trunk/packages/sipb-xen-www/code/controls.py	(revision 588)
+++ trunk/packages/sipb-xen-www/code/controls.py	(revision 589)
@@ -197,6 +197,4 @@
         for disk in machine.disks:
             ctx.current.delete(disk)
-        for access in machine.acl:
-            ctx.current.delete(access)
         ctx.current.delete(machine)
         transaction.commit()