This commit was manufactured by cvs2svn to create tag 'merge_21_head_dst'.

This commit was manufactured by cvs2svn to create tag 'merge_21_head_dst'.

Sprout from branch_2_1 2010-04-14 19:21:45 UTC cvs2svn <admin@example.com> 'This commit was manufactured by cvs2svn to create branch 'branch_2_1'.'
Cherrypick from branch_2_1 2010-10-07 17:06:16 UTC cvs2svn <admin@example.com> 'This commit was manufactured by cvs2svn to create branch 'branch_2_1'.':
    org.glite.lbjp-common.gsoap-plugin/LICENSE
    org.glite.lbjp-common.gsoap-plugin/build.xml
    org.glite.lbjp-common.gsoap-plugin/examples/calc.h.S
    org.glite.lbjp-common.gsoap-plugin/examples/wscalc_clt_ex.c
    org.glite.lbjp-common.gsoap-plugin/examples/wscalc_srv_ex.c
    org.glite.lbjp-common.gsoap-plugin/examples/wscalc_srv_ex2.c
    org.glite.lbjp-common.gsoap-plugin/interface/glite_gscompat.h
    org.glite.lbjp-common.gsoap-plugin/interface/glite_gsplugin-int.h
    org.glite.lbjp-common.gsoap-plugin/interface/glite_gsplugin.h
    org.glite.lbjp-common.gsoap-plugin/project/build.number
    org.glite.lbjp-common.gsoap-plugin/project/build.properties
    org.glite.lbjp-common.gsoap-plugin/project/configure.properties.xml
    org.glite.lbjp-common.gsoap-plugin/project/libtoolhack/gcc
    org.glite.lbjp-common.gsoap-plugin/project/package.description
    org.glite.lbjp-common.gsoap-plugin/project/package.summary
    org.glite.lbjp-common.gsoap-plugin/project/properties.xml
    org.glite.lbjp-common.gsoap-plugin/project/tar_exclude
    org.glite.lbjp-common.gsoap-plugin/src/glite_gsplugin.c
    org.glite.lbjp-common.gsoap-plugin/src/stdsoap2_2.6.2.c
    org.glite.lbjp-common.gsoap-plugin/src/stdsoap2_2.6.2.h
    org.glite.lbjp-common.gsoap-plugin/src/stdsoap2_2.7.0.c
    org.glite.lbjp-common.gsoap-plugin/src/stdsoap2_2.7.0.h
    org.glite.lbjp-common.gsoap-plugin/src/stdsoap2_2.7.0f.c
    org.glite.lbjp-common.gsoap-plugin/src/stdsoap2_2.7.0f.h
    org.glite.lbjp-common.gsoap-plugin/src/stdsoap2_2.7.10.c
    org.glite.lbjp-common.gsoap-plugin/src/stdsoap2_2.7.10.h
    org.glite.lbjp-common.gsoap-plugin/src/stdsoap2_2.7.6b.c
    org.glite.lbjp-common.gsoap-plugin/src/stdsoap2_2.7.6b.h
    org.glite.lbjp-common.gsoap-plugin/src/stdsoap2_2.7.6d.c
    org.glite.lbjp-common.gsoap-plugin/src/stdsoap2_2.7.6d.h
    org.glite.lbjp-common.gsoap-plugin/src/stdsoap2_2.7.9b.c
    org.glite.lbjp-common.gsoap-plugin/src/stdsoap2_2.7.9b.h
    org.glite.lbjp-common.gsoap-plugin/src/stdsoap2_2.7.9d.c
    org.glite.lbjp-common.gsoap-plugin/src/stdsoap2_2.7.9d.h
    org.glite.lbjp-common.gsoap-plugin/test/test_gsplugin_cxx.cpp
    org.glite.lbjp-common.gss/LICENSE
    org.glite.lbjp-common.gss/project/package.description
    org.glite.lbjp-common.gss/project/package.summary
    org.glite.lbjp-common.gss/test/test_gss.cpp
Cherrypick from master 2010-09-04 09:45:18 UTC Aleš Křenek <ljocha@ics.muni.cz> 'The last commit (rev 1.11) should have gone to branch_2_1, IMHO.':
    org.glite.lb.client-java/Makefile
    org.glite.lb.client-java/examples/CreamTest.java
    org.glite.lb.client-java/examples/simple-ssl/ExampleSSLSocketFactory.java
    org.glite.lb.client-java/examples/simple-ssl/LBClientSSL.java
    org.glite.lb.client-java/examples/simple-ssl/MyX509KeyManager.java
    org.glite.lb.client-java/examples/simple-ssl/MyX509TrustManager.java
    org.glite.lb.client-java/examples/simple-trustmanager/LBClientTM.java
    org.glite.lb.client/examples/stats.c
    org.glite.lb.common/src/lb_perftest.c
    org.glite.lb.common/src/log_msg.c
    org.glite.lb.doc/examples/cons_example3.cpp
    org.glite.lb.doc/src/LBUG-Introduction.tex
    org.glite.lb.doc/src/README-standards.txt
    org.glite.lb.doc/src/consumer_api.tex
    org.glite.lb.logger-msg/LICENSE
    org.glite.lb.logger-msg/Makefile
    org.glite.lb.logger-msg/configure
    org.glite.lb.logger-msg/project/ChangeLog
    org.glite.lb.logger-msg/project/il.conf
    org.glite.lb.logger-msg/project/package.description
    org.glite.lb.logger-msg/project/package.summary
    org.glite.lb.logger-msg/project/version.properties
    org.glite.lb.logger-msg/src/activemq_cpp_plugin.cpp
    org.glite.lb.logger/Makefile
    org.glite.lb.logger/interface/il_error.h
    org.glite.lb.logger/interface/interlogd.h
    org.glite.lb.logger/src/event_queue.c
    org.glite.lb.logger/src/interlogd.c
    org.glite.lb.logger/src/perftest_il.sh
    org.glite.lb.logger/src/plugin_mgr.c
    org.glite.lb.logger/src/queue_thread.c
    org.glite.lb.server/src/stats.c
    org.glite.lb/configure
    org.glite.lbjp-common.db/src/db-mysql.c
    org.glite.lbjp-common.db/src/db-pg.c
    org.glite.lbjp-common.gsoap-plugin/Makefile
    org.glite.lbjp-common.gsoap-plugin/configure
    org.glite.lbjp-common.gsoap-plugin/project/ChangeLog
    org.glite.lbjp-common.gsoap-plugin/project/version.properties
    org.glite.lbjp-common.gsoap-plugin/src/stdsoap2_2.7.9l.c
    org.glite.lbjp-common.gsoap-plugin/src/stdsoap2_2.7.9l.h
    org.glite.lbjp-common.gss/Makefile
    org.glite.lbjp-common.gss/configure
    org.glite.lbjp-common.gss/interface/glite_gss.h
    org.glite.lbjp-common.gss/project/ChangeLog
    org.glite.lbjp-common.gss/project/version.properties
    org.glite.lbjp-common.gss/src/glite_gss.c
Delete:
    org.glite.lb.client/examples/webservices/java-trustmanager/Makefile
    org.glite.lb.client/examples/webservices/java-trustmanager/README
    org.glite.lb.client/examples/webservices/java-trustmanager/src/LBClientTM.java
    org.glite.lb.client/examples/webservices/java/Makefile
    org.glite.lb.client/examples/webservices/java/README
    org.glite.lb.client/examples/webservices/java/src/ExampleSSLSocketFactory.java
    org.glite.lb.client/examples/webservices/java/src/LBClientExample.java
    org.glite.lb.client/examples/webservices/java/src/MyX509KeyManager.java
    org.glite.lb.client/examples/webservices/java/src/MyX509TrustManager.java
    org.glite.lb.client/examples/webservices/java/src/log4j.properties
    org.glite.lb.logger/src/il_error.h
    org.glite.lb.logger/src/interlogd.h