merge from peter
authorAndrew Tridgell <tridge@samba.org>
Thu, 26 Apr 2007 15:13:58 +0000 (17:13 +0200)
committerAndrew Tridgell <tridge@samba.org>
Thu, 26 Apr 2007 15:13:58 +0000 (17:13 +0200)
commit4a01ec903576b2168b0618ab1b2023b864b832a3
tree7b78ddb9c681074c6db31af5aa5819bd16a50c48
parent124e38deab720d7ef929791a3c5785563b04534d
parent67ae2ba4fb668c808a09c78e69c911935ad66690
merge from peter
(This used to be ctdb commit e340d8d2af90d9a2819b0029f048cf4727617e7a)