Merge from trunk.

diff --cc lisp/ChangeLog
index 87de09575740a2bcc785c0567b523f736dc98c70,e06199c91c262d326c612deb1bf141d70851c6f2..780ec1001ff114c452c6253cbb4047dca32742d1
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,30 -1,24 +1,55 @@@
 +2011-07-01  Paul Eggert  <eggert@cs.ucla.edu>
 +
++      Time-stamp simplifications and fixes.
++      These improve accuracy slightly, and future-proof the code
++      against some potential changes to current-time format.
++
 +      * woman.el (woman-decode-buffer, WoMan-log-end): Log fractional secs
 +      by using time-since and float-time.
 +
 +      * vc/ediff-util.el (ediff-calc-command-time): Use time-since
 +      and float-time.  Say "NNN.NNN seconds" rather than "NNN seconds
 +      + NNN microseconds".
 +
 +      * type-break.el (type-break-time-sum): Rewrite using time-add.
 +
 +      * play/hanoi.el (hanoi-current-time-float): Remove.
 +      All uses replaced by float-time.
 +
 +      * nxml/rng-maint.el (rng-time-function): Rewrite using time-subtract.
 +      This yields a more-accurate answer.
 +      (rng-time-to-float): Remove; no longer needed.
 +
 +      * emacs-lisp/timer.el (timer-relative-time): Use time-add.
 +
 +      * calendar/timeclock.el (timeclock-seconds-to-time):
 +      Defalias to seconds-to-time, since they're the same thing.
 +
 +      * emacs-lisp/elp.el (elp-elapsed-time):
 +      * emacs-lisp/benchmark.el (benchmark-elapse):
 +      * allout-widgets.el (allout-elapsed-time-seconds): Use float-time.
 +
+ 2011-07-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * window.el (bury-buffer): Don't iconify the only frame.
+       (switch-to-buffer): Revert to Emacs<23 behavior, i.e. do not fallback
+       to pop-to-buffer.  Use pop-to-buffer-same-frame if you don't like that.
+ 
+ 2011-07-01  Chong Yidong  <cyd@stupidchicken.com>
+ 
+       * eshell/em-smart.el (eshell-smart-display-navigate-list):
+       Add mouse-yank-primary.
+ 
+ 2011-07-01  Teodor Zlatanov  <tzz@lifelogs.com>
+ 
+       * progmodes/cfengine3.el: New file to support CFEngine 3.x.
+ 
+ 2011-07-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * emacs-lisp/find-func.el (find-library--load-name): New fun.
+       (find-library-name): Use it to find relative load names when provided
+       absolute file name (bug#8803).
+ 
  2011-06-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
  
        * textmodes/flyspell.el (flyspell-word): Consider words that

diff --cc lisp/gnus/ChangeLog
index 88ba910912e645b60895b13a8701727bfe172143,26740da73df3c38f02a75fede0d2e200baf2f37a..7d1e7ed71986031c0e5c77c77d6cf81a6659de35
--- 1/lisp/gnus/ChangeLog
--- 2/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@@ -1,9 -1,18 +1,26 @@@
-       This is simpler and insulates the code from changes to time formats.
 +2011-07-01  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      * nntp.el (nntp-record-command):
 +      * gnus-util.el (gnus-message-with-timestamp-1):
 +      Use format-time-string rather than decoding time stamps by hand.
++      This is simpler and insulates the code from potential changes to
++      current-time format.
++
+ 2011-07-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+ 
+       * gnus-draft.el (gnus-draft-clear-marks): Mark deleted articles as read.
+ 
+ 2011-07-01  Daiki Ueno  <ueno@unixuser.org>
+ 
+       * plstore.el (plstore-select-keys, plstore-encrypt-to): New variable.
+       (plstore-save): Support public key encryption.
+       (plstore--init-from-buffer): New function.
+       (plstore-open): Use it; fix error when opening a non-existent file.
+       (plstore-revert): Use plstore--init-from-buffer.
+ 
+ 2011-07-01  Daiki Ueno  <ueno@unixuser.org>
+ 
+       * auth-source.el (auth-source-backend): Fix :initarg for data slot.
  
  2011-06-30  Katsumi Yamaoka  <yamaoka@jpl.org>