Merge commit 'origin/master'
authorMartin Schwenke <martin@meltin.net>
Tue, 29 Sep 2009 02:59:10 +0000 (12:59 +1000)
committerMartin Schwenke <martin@meltin.net>
Tue, 29 Sep 2009 02:59:10 +0000 (12:59 +1000)
commite976209996ea243ec4a505c3c31d48c1cd9dcf62
tree627264f4558571f964acd4f231d9e816335e1cee
parent4948051bf4b77cf5a04e2741e922dd152703bad4
parent9bac6f2e2cfc880126349113e977aaf6b9f01b03
Merge commit 'origin/master'

(This used to be ctdb commit 096cdc0c12d22d99f8405bee5cb9f05c616c8492)