Merge branch 'v3-0-test' of git://git.samba.org/samba into v3-0-test
authorJohn H Terpstra <jht@samba.org>
Wed, 21 May 2008 13:44:01 +0000 (08:44 -0500)
committerJohn H Terpstra <jht@samba.org>
Wed, 21 May 2008 13:44:01 +0000 (08:44 -0500)
commitb770a81ac20768aa7be77ea79e44b10120148334
tree4959676e20841cdcb214a3f4b8595befc5d6a734
parent8f5ddd212c6cd094f2941aa590b6d4e915bf904c
parenta39d9ab9c68932c15f5b42d8539aab6dfbc4d57a
Merge branch 'v3-0-test' of git://git.samba.org/samba into v3-0-test