The change that fixed a HORRENDOUS CoreData-related bug which we've been chasing today.

gistfile1.diff

                [managedObjectContext setMergePolicy: NSMergeByPropertyObjectTrumpMergePolicy];
                [managedObjectContext setPersistentStoreCoordinator: coordinator];
-               StoreManagedObjectContextForCurrentThread( managedObjectContext );  // store in thread dictionary
+               
+               if ( [NSThread isMainThread] )
+                       StoreManagedObjectContextForCurrentThread(managedObjectContext);  // store in thread dictionary
+               else
+                       dispatch_sync(dispatch_get_main_queue(), ^{ StoreManagedObjectContextForCurrentThread(managedObjectContext); });
                
                // set some flags in the store metadata
                NSPersistentStore * store = [[coordinator persistentStores] lastObject];