Merge branch 'beta'

Conflicts:

	ChangeLog
	configure.ac
	doc/rsyslog_ng_comparison.html
	doc/status.html
	msg.c
	rsyslog.conf.5
	rsyslog.h
	rsyslogd.8
	syslogd.c

Conflicts were due to patch being multiple times applied in CVS import.

1 files changed, 0 insertions, 3 deletions

diff --git a/expr.c b/expr.c
index e6f4ef23..5c11b756 100644
--- a/expr.c
+++ b/expr.c
@@ -371,7 +371,6 @@ exprParse(expr_t *pThis, ctok_t *tok)
 	/* happy parsing... */
 	CHKiRet(expr(pThis, tok));
 	dbgoprint((obj_t*) pThis, "successfully parsed/created expression\n");
-vmprg.DebugPrint(pThis->pVmprg);
 
 finalize_it:
 	RETiRet;
@@ -392,8 +391,6 @@ CODESTARTobjQueryInterface(expr)
 	 * work here (if we can support an older interface version - that,
 	 * of course, also affects the "if" above).
 	 */
-	//xxxpIf->oID = OBJexpr;
-
 	pIf->Construct = exprConstruct;
 	pIf->ConstructFinalize = exprConstructFinalize;
 	pIf->Destruct = exprDestruct;