Merge commit 'origin/master'
authorMartin Schwenke <martin@meltin.net>
Wed, 21 Oct 2009 10:48:15 +0000 (21:48 +1100)
committerMartin Schwenke <martin@meltin.net>
Wed, 21 Oct 2009 10:48:15 +0000 (21:48 +1100)
commit8b2101bc61d45984bc464ae792de73ee4a56d34f
tree17b97b42ce552bcfeb00eaa1900ef0f6cb5306b1
parent12798118a11d68be82da3fd0a60e08d42292f6d5
parentd5fd4fc0cecf30db22244c1aa88b8bba9c49df92
Merge commit 'origin/master'

(This used to be ctdb commit 61282d4a9be9e544aaa86f3cffc5b58e417f5ab1)