Merge commit 'ronnie-ctdb/master' into tridge tridge/tridge
authorAndrew Tridgell <tridge@samba.org>
Wed, 14 May 2008 04:37:11 +0000 (14:37 +1000)
committerAndrew Tridgell <tridge@samba.org>
Wed, 14 May 2008 04:37:11 +0000 (14:37 +1000)

Trivial merge