update
Merge branch 'master' of github.com:norci/ExtUnitTest
u
Merge branch 'master' of github.com:norci/ExtUnitTest

Conflicts:
	test/Makefile.am