Merge bk://bk.ntp.org/ntp-dev

into  psp-deb1.ntp.org:/home/stenn/ntp-dev

bk: 4dfe8225aoXKEeD7yXMHEc3EF0uUYw

diff --cc ChangeLog
index 9485397d3a07b7614a8056187a66c3ddf0ebd100,2f45721addec73fc0881cc1022f90cc9ec12017d..5bfc72fb927a2b9521c0d7df5abe64cdc3a74ece
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,5 +1,7 @@@
+ * Add the man page tag "flavor" to the loc.* files.
+ * Add/distribute genLocInfo.
 +(4.2.7p183) 2011/06/19 Released by Harlan Stenn <stenn@ntp.org>
 +* Update the autogen include list for scripts/Makefile.am.
  * Added loc.freebsd (and distribute it).
  * Added loc.legacy (and distribute it).
  (4.2.7p182) 2011/06/15 Released by Harlan Stenn <stenn@ntp.org>

diff --cc scripts/Makefile.am
Simple merge