Merge from trunk

diff --cc doc/lispref/ChangeLog
index 3aa84ae62f6c30bb4555adc9744318d4f56285c9,83cee10f8993d0ff6dd6ae5658a0faa84bb1c68c..c43a3fbbf388c9a87ec51a34bba8e0101e6ac683
--- 1/doc/lispref/ChangeLog
--- 2/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@@ -1,12 -1,8 +1,17 @@@
+ 2011-05-31  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+ 
+       * processes.texi (Process Information): Document
+       `process-alive-p'.
+ 
 +2011-05-30  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * windows.texi (Windows and Frames, Window Sizes)
 +      (Resizing Windows): Minor rewrites.
 +      (Splitting Windows): Provide additional examples.  Rewrite
 +      parts on window-splits and window-nest.
 +      (Deleting Windows, Window Parameters, Side Windows): Minor
 +      rewrites.
 +
  2011-05-29  Chong Yidong  <cyd@stupidchicken.com>
  
        * help.texi (Accessing Documentation):

diff --cc lib/getopt_.h
Simple merge

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/dispnew.c
Simple merge

diff --cc src/frame.c
Simple merge