Merge remote branch 'origin/patches-2.0' This branch is the big one that merges all the ntp folks' changes Conflicts: configure.in
2011-02-22T17:41:27