Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Wed, 23 Jan 2008 04:09:55 +0000 (15:09 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 23 Jan 2008 04:09:55 +0000 (15:09 +1100)
commitf82eec69f1846aa46e4afe595d956cfd2256c335
tree63867062b8fb28232a5c175aef511019a34c733a
parent281bc76d3d7605f18ee914cf01dbf09062f5a5f0
parentdf2664ac94efbc2eee4d8a24a793e5f1e77b2d88
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local