Merged tridge's branch.
authorPeter Somogyi <psomogyi@gamax.hu>
Thu, 25 Jan 2007 11:31:33 +0000 (12:31 +0100)
committerPeter Somogyi <psomogyi@gamax.hu>
Thu, 25 Jan 2007 11:31:33 +0000 (12:31 +0100)
commitc11b2f642b0743086c3c0d7b34174baaeac769d5
treeba56dc72952ffaa6a0d03ba6cd37bd1d16793a82
parent7c3982eb3b6b76b7062467b1f768c5e5f58fc9eb
parent0dd4a16d262af69e28ca6539fa711771249393a8
Merged tridge's branch.
Reverted ib join (will do later).

(This used to be ctdb commit a2e0277057407462b71ed3d6f79cea2f8c494f49)