Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Wed, 13 Feb 2008 01:20:02 +0000 (02:20 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 13 Feb 2008 01:20:02 +0000 (02:20 +0100)
commit1a8f5ab78ae24607ff66b06e82aef9316f0ae54b
tree18d2547e49919a50c7edd8dd2e6fbbf8eefadc52
parent8b33860954ca03be1ea45fd8d40963dbbd5b162f
parent38855a9f145b54d05f4a508562fc1a6595e0d895
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial