Merge commit 'origin/master'
authorMartin Schwenke <martin@meltin.net>
Fri, 22 Jan 2010 06:05:11 +0000 (17:05 +1100)
committerMartin Schwenke <martin@meltin.net>
Fri, 22 Jan 2010 06:05:11 +0000 (17:05 +1100)
commitb5254bf4ef74136115e8499500e5963fced2df3a
tree0ca6640f73bcacb9cc00f6631e852c9de068ce9a
parent44f2605dd68ba9b5d89f1c4415fff48ef541e00a
parentd6b0578cfb7a683ecc58efd5a982b0439df150b1
Merge commit 'origin/master'

(This used to be ctdb commit cb00f86752d276ef0ac4dad97f7b380439603286)