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

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

bk: 50a20de4MxSap1UVhX14HljNjia2lQ

diff --cc ChangeLog
index 131f2db4465f766b8a57d59af0e983b54a7ef37d,303bbdd08ff60676a1921a6a6807100e169b3a1e..e16b733755ef8c1e856b36a92d611238dcb5d8cf
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,4 +1,6 @@@
 +* [Bug 1223] Allow configurable values for RLIMIT_STACK and
 +  RLIMIT_MEMLOCK.
+ * [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.
  * [Bug 1217] libisc/ifiter_sysctl.c:internal_current(): Ignore RTM

diff --cc ntpd/ntpd.c
Simple merge