Merge commit 'origin/master'
authorMartin Schwenke <martin@meltin.net>
Wed, 31 Mar 2010 06:52:42 +0000 (17:52 +1100)
committerMartin Schwenke <martin@meltin.net>
Wed, 31 Mar 2010 06:52:42 +0000 (17:52 +1100)
commitce1fe0774b8a0221537d3edae1b6981bf4691126
tree4cab80ed8826c882aad89aece075d2886e59600a
parent71ca5d0a4abc4952dd4a349de63819e36ad2bae3
parentcf25dde27c39b039a3e6785929b1c069fb6f0a62
Merge commit 'origin/master'

(This used to be ctdb commit 4fb662bba6d96d4c04dadd9f908c4184ef4e969a)