Merge commit 'release-4-0-0alpha5' into v4-0-stable
authorStefan Metzmacher <metze@samba.org>
Wed, 2 Jul 2008 13:33:20 +0000 (15:33 +0200)
committerStefan Metzmacher <metze@samba.org>
Wed, 2 Jul 2008 13:33:20 +0000 (15:33 +0200)
(This used to be commit d6652540c2dda9091ccc6d05c3ebb24a663c9fac)


Trivial merge