merge from tridge
authorRonnie sahlberg <ronniesahlberg@gmail.com>
Thu, 19 Apr 2007 00:07:07 +0000 (10:07 +1000)
committerRonnie sahlberg <ronniesahlberg@gmail.com>
Thu, 19 Apr 2007 00:07:07 +0000 (10:07 +1000)
commit1812d787ac4f8609b875b99cb86982001bbe013c
tree74d96c5b87c05e70bf696bd4319102dc12fdf221
parent450ab4a1707cdc490e5e7e2963180bef01e1e65b
parentfde5a66531af99c6d6ef665ccbfbb4944bdefdd3
merge from tridge

(This used to be ctdb commit 414952b2dd48de4a9edb532ba9c2cb6e22bb6d7f)