Merge commit 'obnox-ctdb/v3-2-ctdb' into v3-2-ctdb
authorAndrew Tridgell <tridge@samba.org>
Wed, 6 Aug 2008 22:45:33 +0000 (08:45 +1000)
committerAndrew Tridgell <tridge@samba.org>
Wed, 6 Aug 2008 22:45:33 +0000 (08:45 +1000)

Trivial merge