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)

Trivial merge