Merge commit 'ronnie/master'
authorAndrew Tridgell <tridge@samba.org>
Tue, 7 Apr 2009 07:07:41 +0000 (17:07 +1000)
committerAndrew Tridgell <tridge@samba.org>
Tue, 7 Apr 2009 07:07:41 +0000 (17:07 +1000)
commite2c7475023ac21899f8109b787eee620ad93bb68
tree1416585f81a8cbf43a85d221429644b24b6be75b
parent7e9b69c55d0757aed8f5d4243bb5c51ee5a490ae
parenta87e6f56ae0d42a6e7644cbab39cc205ce3bb715
Merge commit 'ronnie/master'

(This used to be ctdb commit 43c718ebd402abe2e1e6360ce21b08cc13030c88)