Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Wed, 16 Apr 2008 16:17:10 +0000 (18:17 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 16 Apr 2008 16:17:10 +0000 (18:17 +0200)
(This used to be commit b175e7bf16eb26c0bae9731a9147d1d379ca8888)


Trivial merge