[rb_1.0][test.txt][skkim2] modify test.txt for rb_1.0
[master][test.txt][skkim2] modify test.txt for master
Merge branch 'rb_1.0'

Conflicts:
	test.txt