Merge remote-tracking branch 'savannah/master' into HEAD

diff --cc lisp/emacs-lisp/package.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/eval.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/lread.c
Simple merge

diff --cc src/w32.c
Simple merge