Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Wed, 3 Sep 2008 05:34:44 +0000 (15:34 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 3 Sep 2008 05:34:44 +0000 (15:34 +1000)
commitb936d0f3bed9d6ab42803f71cb02c929acf7e518
treefedf5f406371725bc553ca8459183d2f45995f39
parent5dae44e88ea2bd99f936935e11f04cc2ea44eba4
parenta35263e1ab81cac7855158012157769e3e9000f7
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit 9590805bcbdd1924eda5a69978ffac7ec7603451)