=== modified file 'util/installer.c'
--- util/installer.c	2010-08-19 15:37:55 +0000
+++ util/installer.c	2010-08-25 20:56:49 +0000
@@ -999,7 +999,8 @@
     }
 
     attrs= end;
-    while (*attrs == delim || *attrs == ' ')
+    /* If delim is NULL then double-NULL is the end of key-value pairs list */
+    while ((delim && *attrs == delim) || *attrs == ' ')
       ++attrs;
   }