Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz

diff --cc .cproject
index d3926f3,766f365..2b699b9
--- 1/.cproject
--- 2/.cproject
+++ b/.cproject
@@@ -112,10 -111,7 +111,8 @@@
                                                <entry excluding="*.lo|*.o" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="src"/>
                                                <entry excluding="*.o|*.lo" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="util"/>
                                                <entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="client"/>
-                                               <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="include"/>
-                                               <entry excluding="*.lo|*.o" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="zoom"/>
                                                <entry excluding="*.o|*.lo" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="test"/>
 +                                              <entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="zoom"/>
                                        </sourceEntries>
                                </configuration>
                        </storageModule>