Merged branch 'master' of git://git.tokkee.org/sysdb.

Conflicts:
	src/frontend/grammar.y

diff --cc src/frontend/grammar.y
index 74e28dd837f7e8eb7a819e1a0a4ed2ebda032ffb,a607ee0aba96bd0698147b81e0d441ab55182451..e0d8e7ecc46136b01cb84546ba1d3e11d7fb9e2b
--- 1/src/frontend/grammar.y
--- 2/src/frontend/grammar.y
+++ b/src/frontend/grammar.y
@@@ -221,12 -221,12 +221,12 @@@ list_statement
        ;
  
  /*
-  * LOOKUP <type> MATCHING <expression>;
 - * LOOKUP <type> WHERE <condition>;
++ * LOOKUP <type> MATCHING <condition>;
   *
-  * Returns detailed information about <type> matching expression.
+  * Returns detailed information about <type> matching condition.
   */
  lookup_statement:
-       LOOKUP IDENTIFIER MATCHING expression
 -      LOOKUP IDENTIFIER WHERE condition
++      LOOKUP IDENTIFIER MATCHING condition
                {
                        /* TODO: support other types as well */
                        if (strcasecmp($2, "hosts")) {