Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Tue, 19 Feb 2008 17:05:09 +0000 (18:05 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 19 Feb 2008 17:05:09 +0000 (18:05 +0100)
commit02cb396d42976efc03fcb0082e914eb17ae72e11
treeae7bcb5bf5d9f84afa10e814d0909261419c1d68
parent89fd6e9d0c3d0cb2fa3b8109e82f377cd7877a2e
parentd10cbb533c18a6d74160477d34a81bbd4cd6c7c8
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial