Merge remote-tracking branch 'origin/master' into rewrite-filter

diff --cc src/Makefile.am
index 92f526e,564f7b8..42a9577
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -126,26 -123,22 +127,25 @@@ test_session1_SOURCES=test_session1.cp
  test_session2_SOURCES=test_session2.cpp
  test_boost_threads_SOURCES=test_boost_threads.cpp
  test_thread_pool_observer_SOURCES = test_thread_pool_observer.cpp
- test_filter_auth_simple_SOURCES = test_filter_auth_simple.cpp $(filter_src)
- test_filter_factory_SOURCES = test_filter_factory.cpp $(filter_src)
- test_filter_frontend_net_SOURCES = test_filter_frontend_net.cpp $(filter_src)
- test_filter_log_SOURCES = test_filter_log.cpp $(filter_src)
- test_filter_multi_SOURCES = test_filter_multi.cpp $(filter_src)
- test_filter_query_rewrite_SOURCES = test_filter_query_rewrite.cpp $(filter_src)
- test_filter_z3950_client_SOURCES = test_filter_z3950_client.cpp $(filter_src)
- test_filter_backend_test_SOURCES = test_filter_backend_test.cpp $(filter_src)
- test_filter_bounce_SOURCES = test_filter_bounce.cpp $(filter_src)
- test_filter_record_transform_SOURCES = test_filter_record_transform.cpp \
-       $(filter_src)
- test_filter_sru_to_z3950_SOURCES = test_filter_sru_to_z3950.cpp $(filter_src)
- test_filter_virt_db_SOURCES = test_filter_virt_db.cpp $(filter_src)
+ test_filter_auth_simple_SOURCES = test_filter_auth_simple.cpp 
+ test_filter_factory_SOURCES = test_filter_factory.cpp 
+ test_filter_frontend_net_SOURCES = test_filter_frontend_net.cpp 
+ test_filter_log_SOURCES = test_filter_log.cpp 
+ test_filter_multi_SOURCES = test_filter_multi.cpp 
+ test_filter_query_rewrite_SOURCES = test_filter_query_rewrite.cpp
+ test_filter_z3950_client_SOURCES = test_filter_z3950_client.cpp
+ test_filter_backend_test_SOURCES = test_filter_backend_test.cpp
+ test_filter_bounce_SOURCES = test_filter_bounce.cpp
+ test_filter_record_transform_SOURCES = test_filter_record_transform.cpp 
+ test_filter_sru_to_z3950_SOURCES = test_filter_sru_to_z3950.cpp
+ test_filter_virt_db_SOURCES = test_filter_virt_db.cpp 
  test_ses_map_SOURCES = test_ses_map.cpp
- test_router_flexml_SOURCES = test_router_flexml.cpp $(filter_src)
+ test_router_flexml_SOURCES = test_router_flexml.cpp
  test_xmlutil_SOURCES = test_xmlutil.cpp
  
 +test_html_parser_SOURCES = test_html_parser.cpp $(filter_src)
 +test_filter_rewrite_SOURCES = test_filter_rewrite.cpp $(filter_src)
 +
  # doxygen target
  dox:
        (cd $(top_srcdir) ; make dox) 

diff --cc src/factory_static.cpp
Simple merge