Merge commit 'ronnie/master'
authorAndrew Tridgell <tridge@samba.org>
Fri, 6 Mar 2009 00:26:20 +0000 (11:26 +1100)
committerAndrew Tridgell <tridge@samba.org>
Fri, 6 Mar 2009 00:26:20 +0000 (11:26 +1100)
commit7e9b69c55d0757aed8f5d4243bb5c51ee5a490ae
treef5b892ee15180657d445dab2d95b98b64c6aff9d
parenta0c86e4013b34fe86ceac15ac803bae4691d4715
parente2b67ffe98b0323b429c43546d543fc0435ca3f0
Merge commit 'ronnie/master'

(This used to be ctdb commit 0f2664a82128e38ac49c6e8e784129b779616a27)