Merge from mainline.
commita3e44e793796153ff1534be9c74fcab50b45de30
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 17 Jan 2011 19:01:01 +0000 (17 11:01 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 17 Jan 2011 19:01:01 +0000 (17 11:01 -0800)
tree863d5db087c8e034c96d06ea955515f4d3f3d0a3
parent7f818df9420a1320539f7e3e633003573a570413
parent721be9cd4865e9f7d68020adcfa672d2edd52b07
Merge from mainline.
45 files changed:
ChangeLog
Makefile.in
admin/ChangeLog
configure
configure.in
lib-src/emacsclient.c
lib-src/fakemail.c
lib-src/gettext.h
lib-src/make-docfile.c
lib-src/movemail.c
lib-src/pop.c
lib-src/test-distrib.c
lib-src/update-game-score.c
lisp/dired.el
lisp/emacs-lisp/cl-loaddefs.el
lisp/htmlfontify.el
lisp/mail/rmail.el
lisp/ps-print.el
src/ChangeLog
src/alloc.c
src/atimer.c
src/buffer.c
src/data.c
src/deps.mk
src/dired.c
src/dispnew.c
src/doc.c
src/doprnt.c
src/editfns.c
src/fileio.c
src/filelock.c
src/fns.c
src/getloadavg.c
src/getpagesize.h
src/gmalloc.c
src/image.c
src/print.c
src/process.h
src/ralloc.c
src/termcap.c
src/xfns.c
src/xrdb.c
src/xselect.c
src/xsmfns.c
src/xterm.c