Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
authorJelmer Vernooij <jelmer@samba.org>
Wed, 5 Mar 2008 18:42:15 +0000 (19:42 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 5 Mar 2008 18:42:15 +0000 (19:42 +0100)
commit63036a6f3380652c0cb54627bdeabcd212fa2f8c
tree90194f23cb1e6ca483e7773233c326a9b705f85f
parentd41d580c600e3228ff8fee5c16c47580f661a240
parent932c287a406048759fa1ac4bf86e29d96991ded1
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
(This used to be commit 3482cd9b0e81bbc801f1cec33fca82fc45a3ddef)