Merge from trunk; up to r111011.
* mh-e.el (mh-version): Add +bzr to version.
Merge from trunk; up to r111013.
* mh-comp.el: Insure that mail-header-separator is set before
invoking any mml functions.  (closes SF #270).
Merge from trunk; up to r111161.
* mh-folder.el (mh-inc-folder): Revert SF #2321115, SF bugs/250
which processed pending deletes and refiles.  Call to
mh-process-or-undo-commands to insure that pending changes are
properly tagged after including new mail.  (Closes SF bugs/271).
Merge from trunk; up to r111823.
* tramp.texi (top) [xxx, yyy, trampfn]: Provide two versions of
the macros, for Texinfo 4.13 and 5.0.
* automated/python-tests.el
(python-tests-with-temp-buffer): Doc fix.
(python-tests-with-temp-file): New macro.
(python-tests-shell-interpreter): New var.
(python-shell-get-process-name-1)
(python-shell-internal-get-process-name-1)
(python-shell-parse-command-1)
(python-shell-calculate-process-environment-1)
(python-shell-calculate-process-environment-2)
(python-shell-calculate-process-environment-3)
(python-shell-calculate-exec-path-1)
(python-shell-calculate-exec-path-2)
(python-shell-make-comint-1)
(python-shell-make-comint-2)
(python-shell-get-process-1)
(python-shell-get-or-create-process-1)
(python-shell-internal-get-or-create-process-1): New tests.
* lisp/textmodes/paragraphs.el (mark-paragraph): Doc fix.
* xresources.texi (GTK resources): Fix broken link.

Thanks to Mariano Street for reporting this and suggesting
the correct link.
Qcall_interactively and Qexecute_kbd_macro are now static.
* net/tramp-adb.el (tramp-adb-parse-device-names)
(tramp-adb-maybe-open-connection): Add timeouts.  (Bug#13299)
* variables.texi (File Local Variables): Fix reference.

Thanks to Aurélien Aptel and for reporting this problem
and to Xue Fuqiao for suggesting a fix.
* lisp/font-lock.el (lisp-font-lock-keywords-2): Fix highlighting of
&optional.
w32.c (sys_open): Don't reset the flags for FD in fd_info[].

Related to bug #13546.
Fix race conditions with MS-Windows lock files by using _sopen.

 src/filelock.c (create_lock_file) [WINDOWSNT]: Use _sopen with
 _SH_DENYRW flag, instead of emacs_open, to deny any other process
 access to the lock file until it is written and closed.
* NEWS: Add paragraphs for CEDET and EIEIO.
auto upstream
Merge latest Org fixes (commit 7524ef2).