Merge commit 'origin/v3-2-test' into branches/upstream
authorGünther Deschner <gd@samba.org>
Mon, 5 Nov 2007 02:39:18 +0000 (03:39 +0100)
committerGünther Deschner <gd@samba.org>
Mon, 5 Nov 2007 02:39:18 +0000 (03:39 +0100)
(This used to be commit d0bf0ad2ae9a2bff4cec8c7e801a22c624b874ae)


Trivial merge