merge from trunk

author Joakim Verona <joakim@verona.se>

Mon, 16 Sep 2013 06:27:23 +0000 (08:27 +0200)

committer Joakim Verona <joakim@verona.se>

Mon, 16 Sep 2013 06:27:23 +0000 (08:27 +0200)
author Joakim Verona <joakim@verona.se>
Mon, 16 Sep 2013 06:27:23 +0000 (08:27 +0200)
committer Joakim Verona <joakim@verona.se>
Mon, 16 Sep 2013 06:27:23 +0000 (08:27 +0200)
diff --cc configure.ac
Simple merge
diff --cc src/Makefile.in
Simple merge
diff --cc src/xterm.c
Simple merge
author	Joakim Verona <joakim@verona.se>
	Mon, 16 Sep 2013 06:27:23 +0000 (08:27 +0200)
committer	Joakim Verona <joakim@verona.se>
	Mon, 16 Sep 2013 06:27:23 +0000 (08:27 +0200)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/xterm.c	patch \|	diff1 \|	diff2 \|	blob \| history