Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Wed, 28 May 2008 03:42:29 +0000 (13:42 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 28 May 2008 03:42:29 +0000 (13:42 +1000)
commit0f2d8eacf5217b04c88420513a1a1f52e374d659
tree0bfa7b93a0ba286db7839279ddb1f1279e658131
parentbaa2dffdf34c2f3aa150695c60742d616eeb3b09
parentbb264d3a1f212be7eca4b38e61db19de8a26e158
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit 3038dd8a4ffae4113f49547a9d4d6b1c8c46397a)