Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Sun, 24 Aug 2008 22:27:06 +0000 (08:27 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Sun, 24 Aug 2008 22:27:06 +0000 (08:27 +1000)
commita555334db67527b57bc6172e3d08f65caf1e6760
tree67a83e2e4c48523f4e923c82a00d05b4c825c5e5
parenta6146cc14ba950b1911094b1525c7d06b50ecec6
parent3441ea5df5b750442d17b90de73d392d2d802ab1
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local