Merge from trunk
commit15d4f7341a116896aee5b6c15907a21cc75dc66e
authorMartin Rudalics <rudalics@gmx.at>
Sat, 8 Jan 2011 11:58:25 +0000 (8 12:58 +0100)
committerMartin Rudalics <rudalics@gmx.at>
Sat, 8 Jan 2011 11:58:25 +0000 (8 12:58 +0100)
tree68ac5cc5f7e5edbaf7c147be3afb6316c32e2fb2
parent9fc7528c5e9beac580657c989f2da107acaefb57
parente7a4241753be8d11d72945af0c34b45f6645b60e
Merge from trunk
lisp/ChangeLog
lisp/gnus/ChangeLog
src/ChangeLog
src/xdisp.c