Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-simo
commit7c4019beb827ca0279c512998301c8114d2591cf
authorSimo Sorce <idra@samba.org>
Wed, 5 Dec 2007 22:55:50 +0000 (5 17:55 -0500)
committerSimo Sorce <idra@samba.org>
Wed, 5 Dec 2007 22:55:50 +0000 (5 17:55 -0500)
treec61b4e41b9961ee9c2ada2decdbff3f6950f8f5f
parent47ababfa0353549b0317d297ed79f905ffd6e7f5
parent29f85f50a5f47496241221560b78ef3be5b9b3f7
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-simo
(This used to be commit 78581ad070dd6e1886dd2094cf75ebebbb83d9a6)