Merge commit 'origin/master' into martins
authorMartin Schwenke <martin@meltin.net>
Fri, 16 Jan 2009 03:19:55 +0000 (14:19 +1100)
committerMartin Schwenke <martin@meltin.net>
Fri, 16 Jan 2009 03:19:55 +0000 (14:19 +1100)
commitbc826f48726c0443f52e70278c18e8189d6d9d4e
tree5790bf9206513afdc608636fe85e9914b79bc90d
parent580113c2a90c0fcf7623d4aa1390041c73946068
parent23b550d6fc63bbee32897663d116256e96b329cf
Merge commit 'origin/master' into martins

(This used to be ctdb commit 4928718a346f086f1683c78d52b0bf009c1150a3)