Karsten's changes
Merge branch 'master' of github.com:heike/dbaccess

Conflicts:
	Paper.Rnw