Merge deacon.udel.edu:/backroom/snaps/ntp-dev

into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 50a8a298HcP6QpsNvweTzGSAyXCSLw

diff --cc ChangeLog
index afdba49dc253bdd120743e9442acf4881a6c8c8f,28f9824dfa6001aa0540a4f6e75f43ad1292ad4e..29f423a6b1431bae6b5fc587e3e9cb1b1d1b711a
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,5 @@@
 +* html/ updates from Dave Mills.
+ (4.2.7p322) 2012/11/15 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1223] Allow configurable values for RLIMIT_STACK and
    RLIMIT_MEMLOCK.
  * [Bug 1320] Log ntpd's initial command-line parameters. (updated fix)