Merge pull request #4 from y-higuchi/RAMCloud-yoshi

Fix merge miss