Merge from trunk

author Martin Rudalics <rudalics@gmx.at>

Thu, 14 Apr 2011 09:23:01 +0000 (11:23 +0200)

committer Martin Rudalics <rudalics@gmx.at>

Thu, 14 Apr 2011 09:23:01 +0000 (11:23 +0200)
author Martin Rudalics <rudalics@gmx.at>
Thu, 14 Apr 2011 09:23:01 +0000 (11:23 +0200)
committer Martin Rudalics <rudalics@gmx.at>
Thu, 14 Apr 2011 09:23:01 +0000 (11:23 +0200)
diff --cc lisp/ChangeLog
Simple merge
diff --cc lisp/gnus/ChangeLog
Simple merge
diff --cc lisp/minibuffer.el
Simple merge
diff --cc src/ChangeLog
Simple merge
diff --cc src/ChangeLog.11
Simple merge
diff --cc src/xdisp.c
Simple merge
author	Martin Rudalics <rudalics@gmx.at>
	Thu, 14 Apr 2011 09:23:01 +0000 (11:23 +0200)
committer	Martin Rudalics <rudalics@gmx.at>
	Thu, 14 Apr 2011 09:23:01 +0000 (11:23 +0200)
		1	2
lisp/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/gnus/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/minibuffer.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
src/ChangeLog.11	patch \|	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	patch \|	diff1 \|	diff2 \|	blob \| history