Merge commit 'origin/master' into ronnie_merge
authorMartin Schwenke <martin@meltin.net>
Wed, 8 Jul 2009 04:21:05 +0000 (14:21 +1000)
committerMartin Schwenke <martin@meltin.net>
Wed, 8 Jul 2009 04:21:05 +0000 (14:21 +1000)
commit823019870c0831258b96654646f71e9dd69317ec
tree14e399490b1eebd49667f131885ffb891a7db531
parentee7caae3a55a64fb50cd28fa2fd4663c5dd83b4f
parentb67946a6f6b185a7920bf1e560988417c8c4d87d
Merge commit 'origin/master' into ronnie_merge

Conflicts:
config/ctdb.init

Signed-off-by: Martin Schwenke <martin@meltin.net>