Merge branch 'master' into zoom_filter

Conflicts:
	src/filter_zoom.cpp

diff --cc src/filter_zoom.cpp
index 7c88dd9,01a3a5e..da0f017
--- 1/src/filter_zoom.cpp
--- 2/src/filter_zoom.cpp
+++ b/src/filter_zoom.cpp
@@@ -29,7 -29,9 +29,10 @@@ Foundation, Inc., 51 Franklin St, Fift
  
  #include <boost/thread/mutex.hpp>
  #include <boost/thread/condition.hpp>
 +#include <yaz/ccl_xml.h>
+ #include <yaz/ccl.h>
+ #include <yaz/rpn2cql.h>
+ #include <yaz/pquery.h>
  #include <yaz/cql.h>
  #include <yaz/oid_db.h>
  #include <yaz/diagbib1.h>