t
Merge branch 'master' of http://github.com/fschram/cdtoolset

Conflicts:
	test.txt