Merge commit 'origin/master' into martins
authorMartin Schwenke <martin@meltin.net>
Wed, 10 Dec 2008 00:32:24 +0000 (11:32 +1100)
committerMartin Schwenke <martin@meltin.net>
Wed, 10 Dec 2008 00:32:24 +0000 (11:32 +1100)
commitad47f61ea6a9fa24a85d775a516d5dc86772cf8e
tree80035f7778a7087c27f7a4ecdb6be95142d028de
parent5750e979442d671e554d84d87078c1bd4e022741
parent1209079672255012997f5dff997713f55bc3d20a
Merge commit 'origin/master' into martins

(This used to be ctdb commit b5eec91bd185c91a09b3f42ed26fee7b13a70d9d)