diff --git a/SOPE/GDLContentStore/ChangeLog b/SOPE/GDLContentStore/ChangeLog
index 9093b1b91..ba46ca2ff 100644
--- a/SOPE/GDLContentStore/ChangeLog
+++ b/SOPE/GDLContentStore/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-03  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* GCSFolderManager.m: replaced invocations of NSLog with
+	debugWithFormat:. This avoids polluting the log with information
+	that really pertains to debugging.
+
 2009-06-02  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* GCSFolder.m ([GCSFolder -recordsCountByExcludingDeleted:]): new
diff --git a/SOPE/GDLContentStore/GCSFolderManager.m b/SOPE/GDLContentStore/GCSFolderManager.m
index fd0e70b77..773e40974 100644
--- a/SOPE/GDLContentStore/GCSFolderManager.m
+++ b/SOPE/GDLContentStore/GCSFolderManager.m
@@ -130,7 +130,8 @@ static NSLock *lock;
 	      __PRETTY_FUNCTION__, [url absoluteString]);
 	return nil;
       }
-      NSLog(@"Note: setup default manager at: %@", url);
+      if (debugOn)
+        [self debugWithFormat:@"Note: setup default manager at: %@", url];
     }
 #if defined(THREADSAFE)
   [lock unlock];
@@ -155,7 +156,7 @@ static NSLock *lock;
   
   typeMap = [NSMutableDictionary dictionaryWithCapacity:count];
   
-  [self logWithFormat:@"Note: loading %d GCS folder types:", count];
+  [self debugWithFormat:@"Note: loading %d GCS folder types:", count];
   for (i = 0, count = [types count]; i < count; i++) {
     NSString *type;
     GCSFolderType *typeObject;
@@ -163,7 +164,7 @@ static NSLock *lock;
     type       = [[types objectAtIndex:i] stringByDeletingPathExtension];
     typeObject = [GCSFolderType folderTypeWithName: type];
     
-    [self logWithFormat:@"  %@: %s", 
+    [self debugWithFormat:@"  %@: %s", 
 	  type, [typeObject isNotNull] ? "OK" : "FAIL"];
     [typeMap setObject: typeObject forKey:type];
   }