Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Thu, 21 Feb 2008 17:53:00 +0000 (09:53 -0800)
committerJeremy Allison <jra@samba.org>
Thu, 21 Feb 2008 17:53:00 +0000 (09:53 -0800)
commit3a376f1cfa25f79eab8f41a42383f1bd982830ff
treec79b241e6b811dd058f7791cdb561587b1533db1
parent34f23b7ea755eaef6012b653fbcff42714dddcb7
parentbf6dbf8e1b371770a2c9df99b27569c36587df39
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit beb0a76b93f9dd054dbc4192516e7008e59b27d9)