Merge commit 'origin/master' into martins
authorMartin Schwenke <martin@meltin.net>
Thu, 10 Jul 2008 05:08:26 +0000 (15:08 +1000)
committerMartin Schwenke <martin@meltin.net>
Thu, 10 Jul 2008 05:08:26 +0000 (15:08 +1000)
commit5b177f1171c26225248d41c7e19b08442d2e96d7
treed64e5785fa8b1fbd29e45ca4fafe767a3d915810
parentf81d0022c487dc0f3de7b462c65f2a4c79e9aa5e
parenta89778c048df267b36b8a1912fc2cb8f04f5ca69
Merge commit 'origin/master' into martins

(This used to be ctdb commit 747650303b87e50ebc08ef7fa63011e4f19afc4f)
ctdb/Makefile.in