Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-simo
authorSimo Sorce <idra@samba.org>
Wed, 16 Jan 2008 17:06:34 +0000 (12:06 -0500)
committerSimo Sorce <idra@samba.org>
Wed, 16 Jan 2008 17:06:34 +0000 (12:06 -0500)
commit05c22a55a4c052c682a2f2afdb0696504195d18c
tree63b454dfc01c23ca6681537fa73a535372bf42d4
parentdfc80b4f1c00c131ba8077432bfe79f22f63ccd1
parent2ea55c03b25eb5e98be3449e12004a7246319acd
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-simo