merge cleanup

bk: 4e02e046zwUMvUuScxvr4_WrLkDLzw

diff --git a/ChangeLog b/ChangeLog
index 8d42b89f4e7167004f0c7b0f8d0eaee7d25db8da..c1b29750a473edd43a419b3575466c5b1facf0e6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,9 +2,8 @@
 * Finish conversion to genLocInfo.
 * validate MANTAGFMT in genLocInfo.
 * [Bug 1950] Control installation of event_rpcgen.py.
-* ntp_locs.m4: handle the case where . is not in the PATH.
 (4.2.7p185) 2011/06/21 Released by Harlan Stenn <stenn@ntp.org>
-* . may not be in the PATH - ntp_locs.m4 fix.
+* ntp_locs.m4: handle the case where . is not in the PATH.
 * More genLocInfo cleanup.
 (4.2.7p184) 2011/06/20 Released by Harlan Stenn <stenn@ntp.org>
 * Added ntp_locs.m4.