Merge from trunk.

author Eli Zaretskii <eliz@gnu.org>

Wed, 11 Dec 2013 17:06:29 +0000 (19:06 +0200)

committer Eli Zaretskii <eliz@gnu.org>

Wed, 11 Dec 2013 17:06:29 +0000 (19:06 +0200)
author Eli Zaretskii <eliz@gnu.org>
Wed, 11 Dec 2013 17:06:29 +0000 (19:06 +0200)
committer Eli Zaretskii <eliz@gnu.org>
Wed, 11 Dec 2013 17:06:29 +0000 (19:06 +0200)
diff --cc etc/NEWS
Simple merge
diff --cc src/w32term.c
Simple merge
author	Eli Zaretskii <eliz@gnu.org>
	Wed, 11 Dec 2013 17:06:29 +0000 (19:06 +0200)
committer	Eli Zaretskii <eliz@gnu.org>
	Wed, 11 Dec 2013 17:06:29 +0000 (19:06 +0200)
		1	2
etc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
src/w32term.c	patch \|	diff1 \|	diff2 \|	blob \| history