From c5ad46e57fc2e88090624cc0283d9f7c93648b2b Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Tue, 8 Nov 2005 21:11:00 +0000
Subject: [PATCH] *** empty log message ***

---
 ChangeLog | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index f05d0e9bd..3314692a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
-2005-11-08  Paul Eggert  <eggert@cs.ucla.edu>
+2005-11-08  Jim Meyering  <jim@meyering.net>
 
 	* Version 6.0-cvs.
 
+	* NEWS: Merge in changes from b5_9x branch.
+
+2005-11-08  Paul Eggert  <eggert@cs.ucla.edu>
+
 	* NEWS: ls now defaults to --time-style='locale', which in turn acts
 	like --time-style='posix-long-iso' if the locale settings are messed up.
 	* src/ls.c (decode_switches): Implement this.
-- 
2.34.1