merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Thu, 22 Nov 2007 22:51:41 +0000 (09:51 +1100)
committerRonnie Sahlberg <sahlberg@ronnie>
Thu, 22 Nov 2007 22:51:41 +0000 (09:51 +1100)
commit6b5cfde016633fe8c46a6f53512f37748592f140
treecc46aeb1a97fac2e9633677767e72ed5ef68740a
parentb09d3de7596054689cb18fdbd642ced63059e075
parent330bf59ab1c14ca09bb4d60b9dbd02793debff1c
merge from tridge

(This used to be ctdb commit f9e3531747d293711016bce99f08f42366c9d85b)