Merge branch 'v4-0-test' of /home/jelmer/samba4
authorJelmer Vernooij <jelmer@samba.org>
Wed, 21 Jan 2009 13:07:38 +0000 (14:07 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 21 Jan 2009 13:07:38 +0000 (14:07 +0100)

Trivial merge