Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Mon, 11 Feb 2008 12:26:59 +0000 (13:26 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 11 Feb 2008 12:26:59 +0000 (13:26 +0100)
commiteff9c9cedd7410c3c089d090e3f83f8cc10f1831
treef07b9c919ea831143e0a9a4d6f284e04fcc15169
parent54e7d10fe0eb4837b00b9b049fbd59a56ee85bea
parenteb04de69c0e319e18b148191946808f81e1cc8c4
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial