Merge commit 'origin/master' into martins
authorMartin Schwenke <martin@meltin.net>
Fri, 12 Sep 2008 08:21:38 +0000 (18:21 +1000)
committerMartin Schwenke <martin@meltin.net>
Fri, 12 Sep 2008 08:21:38 +0000 (18:21 +1000)
commitb1ce18806d9bd5065eee45a804b0ff6df2a4125b
tree4482f5281b80871be3433287b1f5dcedf4847b43
parent80972d6eff69345f8ef9b17280a83c5534e473de
parent54ffdfd50a5473e38f7e3c7b935433aa5cbf5bae
Merge commit 'origin/master' into martins

(This used to be ctdb commit b3c431abb79a6c18464129695e482ebc84f3964d)