Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Thu, 29 May 2008 21:55:29 +0000 (07:55 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 29 May 2008 21:55:29 +0000 (07:55 +1000)
commit437ca061077e77c3781db49243f0b3a290e8682d
treeae4a697cbc889c95cab16f7a6e169065d00b0b64
parent0613d0b2184319146697f817809d2fa9916f7ac5
parent931d3d8fc5d9aa8ccb16018179fafa35968bb967
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit cd10b381765f9146f22f5cf23f0ef5f6a65e804d)
source4/samba4-skip