merging tridge's code...
authorPeter Somogyi <psomogyi@gamax.hu>
Wed, 31 Jan 2007 11:24:55 +0000 (12:24 +0100)
committerPeter Somogyi <psomogyi@gamax.hu>
Wed, 31 Jan 2007 11:24:55 +0000 (12:24 +0100)
(This used to be ctdb commit 4f97ecf6efb9216a49cf1856fe27337c092f511c)


Trivial merge