Merge commit 'ctdb-ronnie/master'
authorMichael Adam <obnox@samba.org>
Mon, 9 Feb 2009 23:28:08 +0000 (00:28 +0100)
committerMichael Adam <obnox@samba.org>
Mon, 9 Feb 2009 23:28:08 +0000 (00:28 +0100)

Trivial merge