# HG changeset patch
# User Joakim <joakim@localhost.localdomain>
# Date 1282203340 -7200
# Node ID 8e87a11732d42dba6d6246ed43763855065e3607
# Parent  637005c4c3ca28ec4ee7694131e52573bb004bad# Parent  d9c31ab8400599c5c99d6fe03b15aad076ecbc6b
merge the imagemagick branch to trunk

diff -r d9c31ab84005 -r 8e87a11732d4 .hgtags
--- a/.hgtags	Thu Aug 19 09:34:21 2010 +0200
+++ b/.hgtags	Thu Aug 19 09:35:40 2010 +0200
@@ -32,6 +32,7 @@
 1290d63e6ab3ab9e82f2fd0a35c436d05b2e0861 ttn-vms-21-2-B4
 136de3bfa14feaa22a4f959b4273a6ba46a21f76 libc-960211
 14a47b65c288d095f4b98a840ff8671eb8f893fe tmp_pcl_tag_131034C
+14f1ff916f19fdbaa1ca42dc9dde418bba829d3e EMACS_PRETEST_23_1_95
 1550283d0e53c078b71a91aadadd33ab575ac4ae EMACS_22_1
 15c6663e567613de3e6f1a495c12a30402c2c32e zsh-merge-ognus-1
 18f3cb26243f96e95636c2c9857f16bdb153dda7 before-miles-orphaned-changes
@@ -562,6 +563,7 @@
 72276b334084264b708d0e34ad447735c4ce5e22 libc20x-970319
 72276b334084264b708d0e34ad447735c4ce5e22 libc20x-970404
 72276b334084264b708d0e34ad447735c4ce5e22 root-libc-2_0_x-branch
+72f8f4f82b9d27158cd49fd93249f503a2d29228 EMACS_PRETEST_23_1_94
 7361b2115a770c0597610e2c87c0a27de4fa66e0 libc-961121
 73b00b4dd2a6a44d3e03aaf764c0c761f35a32e6 EMACS_PRETEST_21_0_93
 75519a692473ba53cd5c01b411717dd3043e11cd libc_1_09
@@ -885,6 +887,7 @@
 b9483b592728f369b212714efb929c5f9a2fcbb2 libc-960321
 bfc0a609e15a1240a53e580cca2d37ca049e7399 libc-951206
 bfc852aa5b34546929e12d73d920518010fd12bc EMACS_PRETEST_22_1_91
+bfc8980754ed5b8ba76061deadab49dc41e7d7dd EMACS_23_2
 c17fd465ea95fc615961c63088385865705ca8a3 libc-970911
 c17fd465ea95fc615961c63088385865705ca8a3 libc-970912
 c17fd465ea95fc615961c63088385865705ca8a3 libc-970913
@@ -1003,6 +1006,7 @@
 c17fd465ea95fc615961c63088385865705ca8a3 libc-980127
 c17fd465ea95fc615961c63088385865705ca8a3 libc-980128
 c296bfdefcc3e065cdbfe4820fad8bc45e8c824d EMACS_PRETEST_21_0_105
+c3a1d1b47790cdd266fa8dd5b560f94a981266de EMACS_PRETEST_23_1_96
 c47ea87f3bd75650205a60bd22a77ac5c594ce15 libc-970715
 c4bf2875d07244697fba32d82fda761b6d3c296d libc-970506
 c4bf2875d07244697fba32d82fda761b6d3c296d libc-970507
@@ -1019,6 +1023,7 @@
 d0e3ea40717c5b4a2d6c98104885828d69d1793f EMACS_23_1_BASE
 d1641e2dfc5bf66c0747230159fec66f382d8c47 Boehm-GC-base
 d2548396ceddd157578a78683d41a83f25b7c0f3 EMACS_PRETEST_23_0_92
+d4caa51ddfe29f3c5db72f3cf9ced08bf53b12cd EMACS_PRETEST_23_1_97
 d5cbb3a06adcf5683a55d3aebcda44ed39699264 libc-970325
 d5cbb3a06adcf5683a55d3aebcda44ed39699264 libc-970326
 d5cbb3a06adcf5683a55d3aebcda44ed39699264 libc-970327
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/dynamic-setting.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/gnus/nnmail.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/obsolete/complete.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/vc/add-log.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/vc/compare-w.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/vc/cvs-status.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/vc/diff-mode.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/vc/diff.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/vc/ediff-diff.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/vc/ediff-help.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/vc/ediff-hook.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/vc/ediff-init.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/vc/ediff-merg.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/vc/ediff-mult.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/vc/ediff-ptch.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/vc/ediff-util.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/vc/ediff-vers.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/vc/ediff-wind.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/vc/ediff.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/vc/emerge.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/vc/log-edit.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/vc/log-view.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/vc/pcvs-defs.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/vc/pcvs-info.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/vc/pcvs-parse.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/vc/pcvs-util.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/vc/pcvs.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/vc/smerge-mode.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/vc/vc-annotate.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/vc/vc-arch.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/vc/vc-bzr.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/vc/vc-cvs.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/vc/vc-dav.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/vc/vc-dir.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/vc/vc-dispatcher.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/vc/vc-git.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/vc/vc-hg.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/vc/vc-hooks.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/vc/vc-mtn.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/vc/vc-rcs.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/vc/vc-sccs.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/vc/vc-svn.el
diff -r d9c31ab84005 -r 8e87a11732d4 lisp/vc/vc.el
diff -r d9c31ab84005 -r 8e87a11732d4 nt/README.W32
diff -r d9c31ab84005 -r 8e87a11732d4 src/s/usg5-4-common.h
diff -r d9c31ab84005 -r 8e87a11732d4 src/unexcoff.c