merged tridge's code
authorPeter Somogyi <psomogyi@gamax.hu>
Thu, 8 Feb 2007 18:08:58 +0000 (19:08 +0100)
committerPeter Somogyi <psomogyi@gamax.hu>
Thu, 8 Feb 2007 18:08:58 +0000 (19:08 +0100)
(This used to be ctdb commit 85d23c52462f6c706626022c3d2ddf731c93599f)


Trivial merge