Merge commit 'ctdb-ronnie/master'
authorMichael Adam <obnox@samba.org>
Wed, 4 Mar 2009 20:26:25 +0000 (21:26 +0100)
committerMichael Adam <obnox@samba.org>
Wed, 4 Mar 2009 20:26:25 +0000 (21:26 +0100)

Trivial merge