t
t
Merge branch 'teST_2' of http://github.com/fschram/cdtoolset into t2_Brn1

Conflicts:
	test.txt