Merge commit 'origin/master' into martins
authorMartin Schwenke <martin@meltin.net>
Fri, 12 Dec 2008 04:39:53 +0000 (15:39 +1100)
committerMartin Schwenke <martin@meltin.net>
Fri, 12 Dec 2008 04:39:53 +0000 (15:39 +1100)
commitae5e576d32fb971a3af4baf26c981ca4e6485c17
tree0c4a7b41909726ae65cb81aed680b0783a1ffce8
parent0d2c4e181e3a3ac00e0afbaa869f9ea5a43d0b55
parent22772d94631ac8e7a440d4f98f53b963045373b5
Merge commit 'origin/master' into martins

(This used to be ctdb commit 4c5eb616f041e4a10d8f8b3251fc3db5a58e726f)