Merged tridge's code.
authorPeter Somogyi <psomogyi@gamax.hu>
Mon, 12 Feb 2007 14:13:22 +0000 (15:13 +0100)
committerPeter Somogyi <psomogyi@gamax.hu>
Mon, 12 Feb 2007 14:13:22 +0000 (15:13 +0100)
(I had error 206 at direct bzr merge, so 1st I did a "bzr branch" and merged that one.)

(This used to be ctdb commit 9d4d2a8e034f1288583eb98c0f48a51ff323ccac)


Trivial merge