Merge commit 'origin/master'
authorMartin Schwenke <martin@meltin.net>
Wed, 9 Sep 2009 02:48:40 +0000 (12:48 +1000)
committerMartin Schwenke <martin@meltin.net>
Wed, 9 Sep 2009 02:48:40 +0000 (12:48 +1000)
commit92a9e8a6af9dcd78a77fb1e587e2f6d4594ea798
tree8502cf0830b43cac2216d69c982b2c2a8d7d48ff
parent4508260e126bdb98b915ec0dcdf977154158af10
parente578bed20ddc6fa4ca6de88b5bb6864e2bfda925
Merge commit 'origin/master'

(This used to be ctdb commit e978b274a6af94ea7734675243ec65c5b17a583d)