Merge branch 'v4-0-trivial' into v4-0-kvmtest
authorJelmer Vernooij <jelmer@samba.org>
Tue, 19 Feb 2008 13:33:05 +0000 (14:33 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 19 Feb 2008 13:33:05 +0000 (14:33 +0100)
(This used to be commit 732d2bba83c68d337a4a0290245ba8b3eb0635dd)


Trivial merge