diff --git a/ChangeLog b/ChangeLog
index 43598829b..46995e658 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+<<<<<<< variant A
 2012-07-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* OpenChange/MAPIStoreRecurrenceUtils.m
diff --git a/SOPE/GDLContentStore/GCSSpecialQueries.m b/SOPE/GDLContentStore/GCSSpecialQueries.m
index 34a29ab82..d3c916864 100644
--- a/SOPE/GDLContentStore/GCSSpecialQueries.m
+++ b/SOPE/GDLContentStore/GCSSpecialQueries.m
@@ -180,8 +180,8 @@
 - (NSString *) createSessionsFolderWithName: (NSString *) tableName
 {
   static NSString *sqlFolderFormat
-    = (@"CREATE TABLE %@ (" 
-       @" c_id VARCHAR(255) PRIMARY KEY,"
+    = (@"CREATE TABLE %@ ("
+       @" c_id VARCHAR(255) NOT NULL PRIMARY KEY,"
        @" c_value VARCHAR(255) NOT NULL,"
        @" c_creationdate INT4 NOT NULL,"
        @" c_lastseen INT4 NOT NULL)");