commit
Merge branch '1.0.x' of github.com:YasunoriHigashiyama/akebi into 1.0.x

Conflicts:
	src/Makefile
commit