Merge commit 'metze/master-for-ronnie'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Tue, 12 Jan 2010 20:01:40 +0000 (07:01 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Tue, 12 Jan 2010 20:01:40 +0000 (07:01 +1100)
commit62f87f03232f65a243205f55b47cda6a3050e9f6
treeeab8ff76ca8eb8fba93c800eafb617408c987b7a
parent91fba1e121e69745749dd0447689a636579eec17
parent1eb8015ee0fd0ab31f76f69c8ee0943897bc1bad
Merge commit 'metze/master-for-ronnie'

(This used to be ctdb commit 4cc9c79bfced9efa0d3817021512c86ed2fa3516)