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)
commita19534d2072ca7dc4c70767d02db58503678cfaa
tree03541a126783dbdbabfdabebe7ae78c48bfe5075
parente0a5fb8a9be9f3002d6f73c272793a75fa71d313
parentaf007e5837ac472f0527505c8013b837932136bc
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
(This used to be commit eff9c9cedd7410c3c089d090e3f83f8cc10f1831)