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)
commit3e9e91103bf38e198dd84bc50f0e1cdb96cf2ea2
treed90cefaec0593909ed16cea289cb787024cfe43b
parent1966bdbff4c6a3013b4e874d9f4671aa312187a8
parent16a3a6d0cb4c32f9a983f2981bb40bd974667b4f
Merged tridge's code.
(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)