Merge branch 'dev' into dev_dhtmlui
Merge branch 'master' into dev_proxyreq
Merge branch 'dev_proxyreq' into dev_domaindb
Merge branch 'dev_cachemaint' into dev_proxyreq
Merge branch 'dev_cachemaint' into dev_proxyreq
Merge branch 'master' into dev_proxyreq

Conflicts:
	htcache
Merge branch 'dev_proxyreq' into dev_domaindb
Merge branch 'master' into dev_proxyreq

Conflicts:
	system-test
	unit-test
testing
testing
Merge branch 'dev_proxyreq' into dev_domaindb
tests
tests.
tests
Merge branch 'master' into dev_proxyreq
Tests.
Merge branch 'dev_proxyreq' into dev_domaindb
Merge branch 'master' into dev_proxyreq

Conflicts:
	test-results.tab
Merge branch 'dev_proxyreq' into dev_domaindb
Merge branch 'master' into dev_proxyreq