6
Merge branch 'branch5'

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