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 16:01:40 +0000 (18:01 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 14 Apr 2008 16:01:40 +0000 (18:01 +0200)
commit3170ae538a201f1dfe4b6eb70047a31b344a866b
tree58e36e0c85cab643541c297f97bb1c6739a36feb
parentb54e6a815514ef1e5a0a5d11ca43f85e0366b8dc
parent97e09c2f877779ca6d55684d33b1a24b8a280e51
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit f610862dc900cb3ddf0f275641bc3b66ad1f3bc4)