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)
(This used to be commit 52ca48f1881fc7b6ac9d1252468bb20eee174407)


Trivial merge