Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-simo
authorSimo Sorce <idra@samba.org>
Mon, 17 Dec 2007 20:26:16 +0000 (15:26 -0500)
committerSimo Sorce <idra@samba.org>
Mon, 17 Dec 2007 20:26:16 +0000 (15:26 -0500)
commit2e44c4020b09c197e5835f3f646da6e4d5203af2
tree495d21635f190e0e2c0c29b7a9ad045c45c5b1a7
parent4869ccfed6ba8c44fb49844a5a8abbb671518954
parent8f28bda7f8c18de597d345126c9ee03e99776e55
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-simo
(This used to be commit e940537d5be870ae622712a3b76dff891739df8c)