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)
commita7be4d50d468da3ca7a8852780aeb901019d61c3
treefc2eb71d33c4a619189641852cb52fb35da7cd0e
parente83e0f36846ba2b7831a63cb8717432617b337fd
parent2d73e86ccef0ba66309ce764ebe9df0deb076bb8
Merge commit 'origin/v3-2-test' into branches/upstream
(This used to be commit d0bf0ad2ae9a2bff4cec8c7e801a22c624b874ae)