merge from ridge and vl
authorRonnie sahlberg <ronniesahlberg@gmail.com>
Wed, 11 Apr 2007 21:49:28 +0000 (07:49 +1000)
committerRonnie sahlberg <ronniesahlberg@gmail.com>
Wed, 11 Apr 2007 21:49:28 +0000 (07:49 +1000)
(This used to be ctdb commit 8d407c5858a20c9757024f19033b5ef174ec3681)


Trivial merge