Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-simo
commit78581ad070dd6e1886dd2094cf75ebebbb83d9a6
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)
treee4962fc0cffeb7a1c44ba69a2caadc72de773c0a
parent1b133d111596f7fb6a42e526ab69f621df97956a
parent66e7e30b13bc6904f20a1b4277143c63f8beec83
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-simo