Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Wed, 27 Feb 2008 23:33:54 +0000 (10:33 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 27 Feb 2008 23:33:54 +0000 (10:33 +1100)
commitb33873ae5d13993030f41f5304d78640fe07d25c
treeb4d6dfd9833b603b16474b0d5ab7918474c7a8bd
parent17207133ea446670e2123b510a593456928882fb
parent6dec6fbfaddf74c4567e83b354590cfbe3d6d0a9
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit ba864cfd7ce4b69179431131cac9661cbf48bf32)