Rev 238: merge from ronnie in http://samba.org/~tridge/ctdb

[tridge at samba.org]

------------------------------------------------------------
revno: 238
revision-id: tridge at samba.org-20070502214808-txyq9v6djt0tm7m4
parent: tridge at samba.org-20070502211929-dvwisi77qmhpxz7u
parent: sahlberg at ronnie-20070502212129-ea81e17dee5122ae
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge
timestamp: Thu 2007-05-03 07:48:08 +1000
message:
  merge from ronnie
    ------------------------------------------------------------
    revno: 197.1.39
    merged: sahlberg at ronnie-20070502212129-ea81e17dee5122ae
    parent: sahlberg at ronnie-20070502195245-601cd27bc95d4712
    parent: tridge at samba.org-20070502211929-dvwisi77qmhpxz7u
    committer: Ronnie Sahlberg <sahlberg at ronnie>
    branch nick: ctdb
    timestamp: Thu 2007-05-03 07:21:29 +1000
    message:
      merge from tridge
    ------------------------------------------------------------
    revno: 197.1.38
    merged: sahlberg at ronnie-20070502195245-601cd27bc95d4712
    parent: sahlberg at ronnie-20070502120048-4a6d39d2c036946a
    parent: tridge at samba.org-20070502192114-f33n5eur6vzyi8xt
    committer: Ronnie Sahlberg <sahlberg at ronnie>
    branch nick: ctdb
    timestamp: Thu 2007-05-03 05:52:45 +1000
    message:
      merge from tridge