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)
commitd0bf0ad2ae9a2bff4cec8c7e801a22c624b874ae
treef987c6ecd9e2492c1b59d4a086d9ca32c09dcef2
parent52bf835c5e9b2fa759c61bf4a7a364eeaeae6043
parent4cdebda39b9b1790fc5c7df3dc81bfb46b047ad7
Merge commit 'origin/v3-2-test' into branches/upstream