Forgot what this commit is all about
Merge branch 'master' of github.com:rueycheng/kinkaseki

Conflicts:
	Makefile.in
	aclocal.m4
	script/Makefile.in
	src/Makefile.in