aa
Merge branch 'master' into branch5

Conflicts:
	test/src/jp/cz/test/Hoge.java