b17
Merge branch 'origin/mirror' of local repository into b1

Conflicts:
	test.hellogit/src/test/HelloGit.java