Merge commit 'origin/master' into martins
authorMartin Schwenke <martin@meltin.net>
Wed, 10 Dec 2008 00:22:59 +0000 (11:22 +1100)
committerMartin Schwenke <martin@meltin.net>
Wed, 10 Dec 2008 00:22:59 +0000 (11:22 +1100)
commit5750e979442d671e554d84d87078c1bd4e022741
treec8768497d1376c721b91c1b9e906629b5d0a6998
parent60f86400acfa33407d989639f7d674fd5dffec59
parent58bf3804f018ec6e621d77695878bee8def5141d
Merge commit 'origin/master' into martins

(This used to be ctdb commit 6cbe8923ead8226de1c20cfd8718e43fe8525ce1)