Merge from emacs-23

1 files changed, 7 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index a8755321a4d..f473da74811 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * image.c (png_jmpbuf): Remove definition.
+        (my_png_error, png_load): Don't use png_jmpbuf.
+
+2011-01-14  Eli Zaretskii  <eliz@gnu.org>
 2011-01-11  Tassilo Horn  <tassilo@member.fsf.org>
 
         * image.c (imagemagick_load_image, Finit_image_library): Free
@@ -29504,8 +29510,7 @@ See ChangeLog.10 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2007, 2008, 2009, 2010, 2011
-    Free Software Foundation, Inc.
+    Copyright (C) 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.