Merge commit 'origin/v3-2-test' into my_branch
authorGuenther Deschner <gd@samba.org>
Thu, 11 Oct 2007 00:43:29 +0000 (02:43 +0200)
committerGuenther Deschner <gd@samba.org>
Thu, 11 Oct 2007 00:43:29 +0000 (02:43 +0200)
commite1222ec7ea41091ca2eb51867a940cbbadad9514
tree8d46d9202f5640c754ea232311959c0694affb5c
parent31152a498191f2dba07d730ed176fc59e8bd48ca
parentd588123885b8c90f2fea4e0c2e35fee9db5231a6
Merge commit 'origin/v3-2-test' into my_branch
(This used to be commit 52ca48f1881fc7b6ac9d1252468bb20eee174407)