Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Sat, 12 Apr 2008 00:46:17 +0000 (17:46 -0700)
committerJeremy Allison <jra@samba.org>
Sat, 12 Apr 2008 00:46:17 +0000 (17:46 -0700)
commitccb79b383d88b95a7916877efce0afb8a4ab6ca4
tree6b5a5689ff7bc9780e26faecb00ec234b3c2c426
parentf85c4b6905235d5e11ebeadd3e8216e4ae8cc31c
parent85dc216ecbacdff96ac6dcd1937b2a120fba8b07
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit 7258c780f0650c63d6c7c40fd704a9b841600f26)