Merge branch 'dev' into dev_dhtmlui
Merge branch 'dev_domaindb' of github.com:dotmpe/htcache into dev_domaindb
Merge branch 'dev_domaindb' into dev_relstore

Conflicts:
	system-test
	test-results.tab
Merge branch 'dev_relstore' into dev_cachemaint

Conflicts:
	test-results.tab
Var. fixes.
Starting new fork to work on optparse integration