Merge commit 'origin/v3-2-test' into my_branch
authorGuenther Deschner <gd@samba.org>
Thu, 11 Oct 2007 00:33:07 +0000 (02:33 +0200)
committerGuenther Deschner <gd@samba.org>
Thu, 11 Oct 2007 00:33:07 +0000 (02:33 +0200)
commit31152a498191f2dba07d730ed176fc59e8bd48ca
treef334f7801595a64df2913b86c3dc3342e289989e
parentf28dc0280dde74ae9512a00b6c4e276f8d78a55d
parenteb7a53a5569775da53bf8e42275cf613b555e0f2
Merge commit 'origin/v3-2-test' into my_branch
(This used to be commit 83fe2b4261f0357a62ea93b806a14225173f4945)