T
Merge branch 'TEST1' of http://github.com/fschram/cdtoolset into teST_2

Conflicts:
	test.txt