Merge commit 'origin/master'
authorMartin Schwenke <martin@meltin.net>
Tue, 11 Aug 2009 22:48:03 +0000 (08:48 +1000)
committerMartin Schwenke <martin@meltin.net>
Tue, 11 Aug 2009 22:48:03 +0000 (08:48 +1000)
commit7207e1b837f3e784276a2f3a75c64b831f575cad
treec6268df55934e1f0dcc2c77971b701ef4fc126fc
parent1cfed53659160a311986ec958e2887f345389e1c
parent8f393eb987ac34020ce116f6b4a2bb3f6f84238a
Merge commit 'origin/master'

(This used to be ctdb commit 0e9c3e0cf76dd33a24241f02709e56bc330f009a)