Merge from trunk.

author Eli Zaretskii <eliz@gnu.org>

Thu, 18 Oct 2012 18:19:55 +0000 (20:19 +0200)

committer Eli Zaretskii <eliz@gnu.org>

Thu, 18 Oct 2012 18:19:55 +0000 (20:19 +0200)
author Eli Zaretskii <eliz@gnu.org>
Thu, 18 Oct 2012 18:19:55 +0000 (20:19 +0200)
committer Eli Zaretskii <eliz@gnu.org>
Thu, 18 Oct 2012 18:19:55 +0000 (20:19 +0200)
diff --cc lisp/ChangeLog
Simple merge
diff --cc src/ChangeLog
Simple merge
author	Eli Zaretskii <eliz@gnu.org>
	Thu, 18 Oct 2012 18:19:55 +0000 (20:19 +0200)
committer	Eli Zaretskii <eliz@gnu.org>
	Thu, 18 Oct 2012 18:19:55 +0000 (20:19 +0200)
		1	2
lisp/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history