use the thread transaction manager
fix conflict
remove code accidentally checked in
Merge branch 'master' into thread-transaction-manager

Conflicts:
	src/zc/zodbwsgi/README.txt
Merge pull request #4 from zopefoundation/thread-transaction-manager

Use thread transaction manager by default