# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1273116493 0
# Node ID 7d3e117cb7a729cce4a69395110676c404522c04
# Parent  275d802c85700646b5afe59c3db1c16b471a3562# Parent  2b24f3ddbe675aa312ee0af84832dcd9307f1cdc
Synch with Gnus trunk.
(mml-generate-mime-1,mml-compute-boundary-1): Update 'mml
handles on recursive mml-to-mime translation and check them for
boundary delimiter collisions.  Reported by: Greg Troxel.

diff -r 2b24f3ddbe67 -r 7d3e117cb7a7 .hgtags
--- a/.hgtags	Thu May 06 03:27:20 2010 +0000
+++ b/.hgtags	Thu May 06 03:28:13 2010 +0000
@@ -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
diff -r 2b24f3ddbe67 -r 7d3e117cb7a7 lisp/dynamic-setting.el
diff -r 2b24f3ddbe67 -r 7d3e117cb7a7 lisp/obsolete/complete.el