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

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

bk: 4e4993f8TWomzGYmSOwGTqISILiHlQ

diff --cc ChangeLog
index 637df7c2e486adbeb85ab1b4d93f7f0d574c1385,5249ff04fed661e1b58e2344560ac91c22f9e10f..4f635e1edab69c72c04f78cc1a7010895d88695f
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,5 +1,6 @@@
 +* Added support for Garmin's $PGRMF sentence to NMEA driver
+ * [Bug 1988] Better sntp send failed error message needed.
+ * [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.
  * Actually use long long for (u_)int64 by correcting spelling of