Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Fri, 7 Dec 2007 17:57:19 +0000 (09:57 -0800)
committerJeremy Allison <jra@samba.org>
Fri, 7 Dec 2007 17:57:19 +0000 (09:57 -0800)
commit5b3459e34017b2eea1d82233a07bef8a418613f4
treeba4e758b1f484d1472e4bc9325f67bf62673ed2b
parent9e03d6117a2c3049bdb3e2a7226e7b91283bbc23
parentd3b4b69a270efd85728ac77fe23a0fb39d9dce10
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit 0c21c5fa84e18d78801ab79abd726e5588902476)