Merge branch 'v3-0-test' of ssh://jra@git.samba.org/data/git/samba into v3-0-test
commit993d8d50103a0dc1dddc31c86b82cbfe6083f3b3
authorJeremy Allison <jra@samba.org>
Sun, 22 Jun 2008 01:37:22 +0000 (21 18:37 -0700)
committerJeremy Allison <jra@samba.org>
Sun, 22 Jun 2008 01:37:22 +0000 (21 18:37 -0700)
tree03179708b1b8d743a8c8fe0f4f601b7fa877bdf9
parent7cb46e9e59355bcff032085d7d883441a34d2482
parentd183dc676db0d91ae6b0759c8fd094c4a888d29d
Merge branch 'v3-0-test' of ssh://jra@git.samba.org/data/git/samba into v3-0-test