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

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

bk: 4abf119a7Arh_vfeDwneHLsbb-9XDw

diff --cc ChangeLog
index c4a28c431ae2a4adcc12f1ec113436007927f6fc,4a843b61f89ae4c8996756be9f6438aaff83291b..887538cbc67c8807852bde22c6eb90eb53d96601
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,15 -1,4 +1,16 @@@
 +* 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.
 +* Updated build and flock-build scripts.  flock-build --one is a way
 +  to perform a flock-build compatible solitary build, handy for a repo
 +  clone's first build on a machine with autoconf, automake, etc.
 +* Compiling ntp_parser.y using BSD make correctly places ntp_parser.h
 +  in the top-level ntpd directory instead of A.*/ntpd.
 +* bootstrap script updated to remove potentially stale .deps dirs.
+ (4.2.5p221) 2009/09/26 Released by Harlan Stenn <stenn@ntp.org>
  * [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>