Merge branch 'master' of git://git.samba.org/tridge/ctdb
authorRonnie Sahlberg <sahlberg@ronnie.(none)>
Mon, 4 Feb 2008 09:28:19 +0000 (20:28 +1100)
committerRonnie Sahlberg <sahlberg@ronnie.(none)>
Mon, 4 Feb 2008 09:28:19 +0000 (20:28 +1100)
commita7aced27fd889655a0cd90d50c35935db5189fa1
treeed400ebea82c67a25f2ebd0eb934abf6994072cf
parent04aa3fb074bbed7160d7f97485f6f6a12246819c
parentf6e53f433bf8e184ffc281f14c4eacda1ffc935c
Merge branch 'master' of git://git.samba.org/tridge/ctdb

(This used to be ctdb commit 08164957f948f0c9f604c260ccf658df9b3440b7)