Merge from trunk

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

Sat, 10 Apr 2010 12:42:15 +0000 (14:42 +0200)

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

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