Merge branch 'master' of ssh://www.gniibe.org/home/gniibe/git/neug