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)
(This used to be ctdb commit e340d8d2af90d9a2819b0029f048cf4727617e7a)


Trivial merge