Merge commit 'ctdb-ronnie/master'
authorMichael Adam <obnox@samba.org>
Thu, 26 Mar 2009 18:02:50 +0000 (19:02 +0100)
committerMichael Adam <obnox@samba.org>
Thu, 26 Mar 2009 18:02:50 +0000 (19:02 +0100)

Trivial merge