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)
commit9590805bcbdd1924eda5a69978ffac7ec7603451
tree5664db5502de7d817b430fdc289b69c6b6c8b59f
parent91ae8dca254aa8c032daf0c87fa2a47760d32586
parent82fcd7941f5c54da2d994c8bd99dd8d86299a296
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet