Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Fri, 29 Feb 2008 14:34:45 +0000 (15:34 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 29 Feb 2008 14:34:45 +0000 (15:34 +0100)
commit3067428a8fa30425b7106954636afd0f8460585d
treeced3f221db99715ec150f716548748d285a3f1ec
parent232d51e666a9a9dd65579d9c7b5873bafa9f669d
parente0081626ecf784351ad5f0bf7f6faeab8601e648
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 18c683d7e804e76ac37d4069429b5ba1a9d9ae38)