merge upstream.

1 files changed, 15 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d2ea294d2d0..d81f39aa64c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,18 @@
+2011-08-08  Chong Yidong  <cyd@stupidchicken.com>
+
+        * image-dired.el: Don't use find-file for temporary work (Bug#7895).
+        (image-dired--with-db-file): New macro.
+        (image-dired-write-tags, image-dired-remove-tag)
+        (image-dired-create-gallery-lists, image-dired-write-comments)
+        (image-dired-get-comment, image-dired-mark-tagged-files)
+        (image-dired-list-tags, image-dired-gallery-generate): Use it.
+        (image-dired-gallery-generate): Use insert-file-contents.
+
+        * time.el (display-time-world-list, display-time-world-display):
+        * time-stamp.el (time-stamp-string):
+        * vc/add-log.el (add-change-log-entry): Use setenv instead of
+        set-time-zone-rule (Bug#7337).
+
 2011-08-08  Daiki Ueno  <ueno@unixuser.org>
 
         * epg.el (epg--status-KEYEXPIRED, epg--status-KEYREVOKED): Fix typo.