update.
Merge branch 'master' of https://github.com/cjkvi/cjkvi-emacs

Conflicts:
	ivs-utils.el