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

Trivial merge