Merge branch 'keymap2'

author tmk <nobody@nowhere>

Mon, 11 Feb 2013 03:48:49 +0000 (12:48 +0900)

committer tmk <nobody@nowhere>

Mon, 11 Feb 2013 03:48:49 +0000 (12:48 +0900)
author tmk <nobody@nowhere>
Mon, 11 Feb 2013 03:48:49 +0000 (12:48 +0900)
committer tmk <nobody@nowhere>
Mon, 11 Feb 2013 03:48:49 +0000 (12:48 +0900)
diff --cc common/command.c
Simple merge
diff --cc common/host.h
Simple merge
author	tmk <nobody@nowhere>
	Mon, 11 Feb 2013 03:48:49 +0000 (12:48 +0900)
committer	tmk <nobody@nowhere>
	Mon, 11 Feb 2013 03:48:49 +0000 (12:48 +0900)
		1	2
common/command.c	patch \|	diff1 \|	diff2 \|	blob \| history
common/host.h	patch \|	diff1 \|	diff2 \|	blob \| history