K 10
svn:author
V 6
murray
K 8
svn:date
V 27
2002-02-19T12:15:09.000000Z
K 7
svn:log
V 112
Resolve conflicts.
  * Note that option hostname is only honored if the hostname is not
    already set. (r1.2)

END