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

into  psp-deb1.ntp.org:/home/perlinger/ntp-dev-2473

bk: 524149db3CqwffVRSUa99phqQIgoQA

diff --cc ChangeLog
index fb364008844bba782e37936bd40a18ef3cda2900,b280dcdbc4d8722a4f0768399f5abcb93a8ba62e..6a715cdd8c4e799650deba826e5b8ca7b3825339
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,5 +1,8 @@@
 +* [Bug 2473] revisited: NTPD exits after clock is stepped backwards
 +  Avoid possible unsigned underrun for startup condition when testing
 +  for clock backstep.
+ * [Bug 2481] ntpd aborts when both user and group are specified with -u.
+ * [Bug 2482] Add droproot ahd jail support for Solaris.
  (4.2.7p388) 2013/09/19 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 2473] NTPD exits after clock is stepped backwards externally
  (4.2.7p387) 2013/09/16 Released by Harlan Stenn <stenn@ntp.org>