Merge commit 'origin/v3-2-test' into v3-2-ctdb
authorMichael Adam <obnox@samba.org>
Wed, 11 Feb 2009 21:42:26 +0000 (22:42 +0100)
committerMichael Adam <obnox@samba.org>
Wed, 11 Feb 2009 21:42:26 +0000 (22:42 +0100)

Trivial merge