Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
commitb869a525b1f40baf881a725e5632b39c99268d67
authorAndrew Bartlett <abartlet@samba.org>
Sun, 11 May 2008 23:44:27 +0000 (12 09:44 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Sun, 11 May 2008 23:44:27 +0000 (12 09:44 +1000)
tree594e53b6f5ad26e28ad8fe78d9119275e4ac319d
parent00ebe3df811a9eb7737fa6278d8784500c35bd14
parent5d02514f72c6c89bc28b4c5de3d95bb8a439b56e
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 61c31dc7cf649bc6f2d14bc8637e50ead9b9210a)