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

into  pogo.udel.edu:/pogo/users/hart/ntp-dev-320-1192

bk: 4a174fceNx9BOrtjHxWWcS7q1kE7FQ

diff --cc ChangeLog
index 0b96a8b247ef76567c8c24551f7fbbcfae1f3a96,b4f8b9559801dce04d86180270ebe3976ff6fdec..40727a4c2faf5a71349f98b48c9f36cd41952d27
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,5 +1,6 @@@
 +* Bug [1193] Compile error: conflicting types for emalloc
+ * xmt -> aorg timestamp cleanup from Dave Mills, reported by Dave Hart.
+ * Leap/expire cleanup from Dave Mills.
  (4.2.5p178) 2009/05/21 Released by Harlan Stenn <stenn@ntp.org>
  * Provide erealloc() and estrdup(), a la emalloc().
  * Improve ntp.conf's parser error messages.