diff --git a/[refs] b/[refs]
index a0c9ff04e39f..ea32040f0ed9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e703ddae383abb24b1c7f363cb0df7e78a44ea45
+refs/heads/master: 8bd6026e88cb2eb1e60ee40c7a1a0786b2db6623
diff --git a/trunk/lib/dynamic_debug.c b/trunk/lib/dynamic_debug.c
index 4be55d8d76b8..86a9abb9a1ce 100644
--- a/trunk/lib/dynamic_debug.c
+++ b/trunk/lib/dynamic_debug.c
@@ -183,6 +183,8 @@ static int ddebug_tokenize(char *buf, char *words[], int maxwords)
 		buf = skip_spaces(buf);
 		if (!*buf)
 			break;	/* oh, it was trailing whitespace */
+		if (*buf == '#')
+			break;	/* token starts comment, skip rest of line */
 
 		/* find `end' of word, whitespace separated or quoted */
 		if (*buf == '"' || *buf == '\'') {