Fix incorrect merge of '1016795b404ffa0d12a817e68725268f70fb756e'
Merge pull request #2 from hattya/master

Fix incorrect merge of '1016795b404ffa0d12a817e68725268f70fb756e'
Merge branch 'master' of git://github.com/knu/z