Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Sun, 6 Apr 2008 09:16:43 +0000 (19:16 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Sun, 6 Apr 2008 09:16:43 +0000 (19:16 +1000)
commitbeff331e15e7896d80831135fd52b90cd9ab073e
tree0f858734cdaafc50c000d3b1cb26579efc0ed63f
parent88b7a3980c7be90ea0099a3ecf08ad00fa89ea1a
parentda8b8364b06a79a10d4ebdc0e451463b3105730e
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet