Merge commit 'origin/v3-2-stable' into v3-2-ctdb
authorMichael Adam <obnox@samba.org>
Thu, 22 May 2008 21:04:53 +0000 (23:04 +0200)
committerMichael Adam <obnox@samba.org>
Thu, 22 May 2008 21:04:53 +0000 (23:04 +0200)

Trivial merge