# 
# patch "ChangeLog"
#  from [a249de13a65c6a8bfffa7e562d90a2395d5a572f]
#    to [862fae236c72be34dd0cc89ac3a166902bf8af5c]
# 
# patch "NEWS"
#  from [2bbd024be3bbebcea0325685bf322b148aa7abff]
#    to [9420654d5008690fe9816a4470b823dc88fe7007]
# 
========================================================================
--- ChangeLog	a249de13a65c6a8bfffa7e562d90a2395d5a572f
+++ ChangeLog	862fae236c72be34dd0cc89ac3a166902bf8af5c
@@ -1,16 +1,13 @@
+2005-11-26  Nathaniel Smith  <address@hidden>
+
+	* ChangeLog: fixup after merge.
+
 2005-11-27  Daniel Carosone  <address@hidden>
 
 	* monotone.texi, std_hooks.lua: sync hook definitions with
 	std_hooks.lua, and group the descriptions into @subsections,
 	reordering a few items accordingly.
 
-2005-11-26  Grahame Bowland  <address@hidden>
-
-	* automate.cc (automate_stdio) add wrapper function to read()
-	so that loops will not wind backwards possibly overrunning buffers
-	if an error occurs. Hopefully fixes some of the strange edge cases
-	seen using automate. (Closes #15062 in bug tracker)
-
 2005-11-26  Nathaniel Smith  <address@hidden>
 
 	* Makefile.am: Remove botan/{omac,fips_rng}.h.
========================================================================
--- NEWS	2bbd024be3bbebcea0325685bf322b148aa7abff
+++ NEWS	9420654d5008690fe9816a4470b823dc88fe7007
@@ -90,6 +90,9 @@
         - New command 'automate keys' to get information on existing
           keys in basic_io format.
 
+        Updated translations:
+        - fr
+
         Smaller changes:
         - Improved handling of multibyte characters in message
           displays.