Merge branch 'ff/ntpd'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 1 Nov 2006 10:09:47 +0000 (11:09 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 1 Nov 2006 10:09:47 +0000 (11:09 +0100)
commit2b19a39383baeebb4fe290e156eb709f044d0593
treed9b12da359ae99fbbdabc8bd5866b6dee605c5d9
parent444a2bce1161bb09c268f42757fc0fec83990549
parent8694f0e52bacc8899a349a8d01f88b3f14cf897b
Merge branch 'ff/ntpd'