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

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

bk: 50a2dd71rmj9rz3uxDrmdYBEw5Rc0Q

diff --cc ChangeLog
index e16b733755ef8c1e856b36a92d611238dcb5d8cf,4213ee0a5def26973ff6adae00f98bc2b4a27e89..85a5f0fc3a198c84385a6c057a15ca9a595707de
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,5 +1,7 @@@
 +* [Bug 1223] Allow configurable values for RLIMIT_STACK and
 +  RLIMIT_MEMLOCK.
+ * [Bug 1320] Log ntpd's initial command-line parameters. (updated fix)
+ (4.2.7p321) 2012/11/13 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1320] Log ntpd's initial command-line parameters.
  (4.2.7p320) 2012/11/12 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 969] Clarify ntpdate.html documentation about -u and ntpd.

diff --cc ntpd/ntpd.c
Simple merge