Merge commit 'origin/master' into martins
authorMartin Schwenke <martin@meltin.net>
Tue, 16 Dec 2008 00:21:55 +0000 (11:21 +1100)
committerMartin Schwenke <martin@meltin.net>
Tue, 16 Dec 2008 00:21:55 +0000 (11:21 +1100)
commit6d7732928f15888104e034795ec1e862b63fafa6
treeae5e642aeb5710fc9b3fee941a8f2bff5a98510b
parentb3dbc3f3aa0cb9e2ae338ea44dee0d4c7b4e51b5
parentf844ca744a709f7f617795f0035052a48f0b397f
Merge commit 'origin/master' into martins

(This used to be ctdb commit da61a9822f66ff227b8859bf15ba76fd9afb9d12)