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)
commit588531bf211f5ede2731df56fd540934b673a2d7
treeb865a1c246cee4a7489eec1fccd1e4242cd5e55b
parent48dc07902ffb792532ff216e507e53103d448b7b
parentff14ffc6582874d8248798bebd57703fbdbda942
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local