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)
commit52ca48f1881fc7b6ac9d1252468bb20eee174407
treea84cdcb0b73f022a996d706558e3eb0818dc3e02
parent83fe2b4261f0357a62ea93b806a14225173f4945
parente00ea359d66347a7c6f5d75de1670f788bfdc310
Merge commit 'origin/v3-2-test' into my_branch