Merge psp-deb1.ntp.org:/home/hart/ntp-dev-strerror_r

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

bk: 4d355404qUNFnQ3_LvWvJEmwSqA6Uw

diff --cc ChangeLog
index 7fa7d58f1d750189a0fc914e2eb2036356f0f07e,0bcc93fd3d3907c543d9418beaf8ccdc31c43406..de493ac9b816091dd8b73ef658360661e7f8ac9d
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,6 +1,7 @@@
 +* Correct msyslog.c build break on Solaris 2.9 from #ifdef/#if mixup.
+ (4.2.7p118) 2011/01/15 Released by Harlan Stenn <stenn@ntp.org>
+ * Simplify the built-sources stuff in sntp/ .
+ * Fix check for -lipv6 on HP-UX 11.
  (4.2.7p117) 2011/01/13 Released by Harlan Stenn <stenn@ntp.org>
  * Add configure --without-sntp option to disable building sntp and
    sntp/tests.  withsntp=no in the environment changes the default.