Merge shiny.ad.hartbrothers.com:c:/ntp/ntp-dev-libisc-9.6.1-P1

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-ylwrap

bk: 4abf0a5eRgKroIhg3c_GNIlRl6GMgw

diff --cc ChangeLog
index 8ddba8d49cd9f7e2e7dab13b65612a7c9440eb89,92384b52961ab71141a673db2df21d315ad5699a..fd7eb2cf98d03b9d58c9d21255dc97114496b553
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,4 +1,10 @@@
 +* Update libisc code using bind-9.6.1-P1.tar.gz, rearrange our copy to
 +  mirror the upstream layout (lib/isc/...), and merge in NTP-local
 +  modifications to libisc.  There is a new procedure to ease future
 +  libisc merges using a separate "upstream" bk repo.  That will enable
 +  normal bk pull automerge to handle carrying forward any local changes
 +  and should enable us to take updated libisc snapshots more often.
+ * [Bug 1316] segfault if refclock_nmea can't open file.
  * [Bug 1317] Distribute cvo.sh.
  (4.2.5p220) 2009/09/25 Released by Harlan Stenn <stenn@ntp.org>
  * Rearrange libisc code to match the upstream layout in BIND.  This is