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

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

bk: 4e499d41iwJpNABeCSXnA1ePFcWyCw

diff --cc ChangeLog
index 4f635e1edab69c72c04f78cc1a7010895d88695f,af74646bcdefa2086e38974d13ce0cc4e7fec4b9..6f3540d62435a9d205f558fef0e9e616ffe3b5f5
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,5 +1,6 @@@
 +* Added support for Garmin's $PGRMF sentence to NMEA driver
  * [Bug 1988] Better sntp send failed error message needed.
+ * [Bug 1989] sntp manual page sometimes refers to SNTP as a program.
  * [Bug 1990] sntp output should include stratum.
  (4.2.7p203) 2011/08/13 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1986] Require Visual C++ 2005 or later compilers in Windows port.