Merge commit 'origin/v3-2-stable' into v3-2-ctdb
authorMichael Adam <obnox@samba.org>
Thu, 31 Jul 2008 16:16:33 +0000 (18:16 +0200)
committerMichael Adam <obnox@samba.org>
Thu, 31 Jul 2008 16:16:33 +0000 (18:16 +0200)

Trivial merge