Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Fri, 25 Jan 2008 00:16:40 +0000 (16:16 -0800)
committerJeremy Allison <jra@samba.org>
Fri, 25 Jan 2008 00:16:40 +0000 (16:16 -0800)
commitd490d8d52d929076b2e5ab54ae0a9aff2d836677
tree757df204719cb701173bed8e731aed62b830f2ec
parent50c7e98a46a1c97011f37c78db8caddc634d6994
parent92183450f1eedd2892ed8612ccaf97c65098c636
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit ef2913a66c3888d4813d8b778ddd63b2c7e48f3e)