Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Thu, 10 Jan 2008 22:55:28 +0000 (09:55 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 10 Jan 2008 22:55:28 +0000 (09:55 +1100)
commit4f6177da78d0da64c1cda23bd7a176cfe2e6e140
tree702f9b3f3821953c3a0d956db5ea2700be12943b
parent3688b7669a03ae9e5166f12ab9e1a82f066002c7
parentdc6058e9922b277c01b0569042a62509b7294dec
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit 588531bf211f5ede2731df56fd540934b673a2d7)