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)
(This used to be commit eff9c9cedd7410c3c089d090e3f83f8cc10f1831)


Trivial merge