Merge branch 'v3-0-test' of git://git.samba.org/samba into v3-0-test
authorJohn H Terpstra <jht@samba.org>
Fri, 23 May 2008 13:30:23 +0000 (08:30 -0500)
committerJohn H Terpstra <jht@samba.org>
Fri, 23 May 2008 13:30:23 +0000 (08:30 -0500)
commitad7ad45eb8cd40baeafacf5fdec13dbd1e0304d3
treebdbe9d22bf0fd7a1b75ae7a0cbb20063b6af5535
parenta14ae0c29d3777bebe98ced4c4871cc4d9afc699
parenta7ad5189670d6497c958edc1a85e41ecb50df837
Merge branch 'v3-0-test' of git://git.samba.org/samba into v3-0-test