Merge from trunk

author Jan Djärv <jan.h.d@swipnet.se>

Fri, 2 Apr 2010 12:06:55 +0000 (14:06 +0200)

committer Jan Djärv <jan.h.d@swipnet.se>

Fri, 2 Apr 2010 12:06:55 +0000 (14:06 +0200)
author Jan Djärv <jan.h.d@swipnet.se>
Fri, 2 Apr 2010 12:06:55 +0000 (14:06 +0200)
committer Jan Djärv <jan.h.d@swipnet.se>
Fri, 2 Apr 2010 12:06:55 +0000 (14:06 +0200)
diff --cc src/keyboard.c
Simple merge
diff --cc src/xdisp.c
Simple merge
diff --cc src/xterm.c
Simple merge
author	Jan Djärv <jan.h.d@swipnet.se>
	Fri, 2 Apr 2010 12:06:55 +0000 (14:06 +0200)
committer	Jan Djärv <jan.h.d@swipnet.se>
	Fri, 2 Apr 2010 12:06:55 +0000 (14:06 +0200)
		1	2
src/keyboard.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/xterm.c	patch \|	diff1 \|	diff2 \|	blob \| history