Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Mon, 14 Apr 2008 11:49:47 +0000 (13:49 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 14 Apr 2008 11:49:47 +0000 (13:49 +0200)
commita96bba21fa99d7057f001bfc159930052d83d974
tree3d00eba12b29f6ff939110bccf26021c78334fee
parentca78fa8cae96099055a6ae7a0963c2b2789f2b87
parent7cf29ac84e2f45dfc56d5e46678a96527a38a1c1
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit 92751a73cd854365d365db854179bfd5aeabe7a2)