Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into HEAD
authorJelmer Vernooij <jelmer@samba.org>
Tue, 15 Apr 2008 09:10:56 +0000 (11:10 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 15 Apr 2008 09:10:56 +0000 (11:10 +0200)
commit961f412190a97c1de82b4ee3a51db10f43ce14c8
tree52c1afb42e55c64c576cafc7e60c302b05192235
parentc937efc1a6f7c117119bc43b91c8554825b5a9f9
parentc7d95967643e3acac0b2f03b107f90d44a99ed66
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into HEAD
(This used to be commit a039acb9156b3855e8565ce6d1ca078aea18a349)