Merge commit 'origin/master'
authorMartin Schwenke <martin@meltin.net>
Mon, 7 Sep 2009 05:29:34 +0000 (15:29 +1000)
committerMartin Schwenke <martin@meltin.net>
Mon, 7 Sep 2009 05:29:34 +0000 (15:29 +1000)
commit93851d1ddf7b417ec9ed45a08b726cc9ba148b1e
tree256b35ff749ff92e9046f3db878e169fe1bb2a14
parent9d03cfde3a0506772b799da5510e5195cb9cbea7
parent263d76f8c2536594adb679aace59a0981e2fcc97
Merge commit 'origin/master'

(This used to be ctdb commit 10ebeb215e7260186dab8f4f2403c48db9df9a00)