Merge commit 'origin/v3-2-test' into my_branch
commit83fe2b4261f0357a62ea93b806a14225173f4945
authorGuenther Deschner <gd@samba.org>
Thu, 11 Oct 2007 00:33:07 +0000 (11 02:33 +0200)
committerGuenther Deschner <gd@samba.org>
Thu, 11 Oct 2007 00:33:07 +0000 (11 02:33 +0200)
tree3f7bab34d33f084e9aa9af16722f2117c856ef96
parent5fa3fc81b765f1d9682170de13d2e10994fdd889
parentbe916777da8c681c393b817105e3dfe8a9c4ef12
Merge commit 'origin/v3-2-test' into my_branch