Merge commit 'origin/v3-2-stable' into v3-2-ctdb
authorMichael Adam <obnox@samba.org>
Thu, 28 Aug 2008 14:38:21 +0000 (16:38 +0200)
committerMichael Adam <obnox@samba.org>
Thu, 28 Aug 2008 14:38:21 +0000 (16:38 +0200)

Trivial merge