Merge commit 'origin/v3-2-test' into v3-2-obnox
authorMichael Adam <obnox@samba.org>
Wed, 24 Oct 2007 21:25:52 +0000 (23:25 +0200)
committerMichael Adam <obnox@samba.org>
Wed, 24 Oct 2007 21:25:52 +0000 (23:25 +0200)

Trivial merge