Merge branch 'v4-0-local' of git://git.id10ts.net/samba into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Fri, 28 Mar 2008 00:00:48 +0000 (01:00 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 28 Mar 2008 00:00:48 +0000 (01:00 +0100)

Trivial merge