Merge commit 'release-4-0-0alpha2' into v4-0-test
authorStefan Metzmacher <metze@samba.org>
Fri, 21 Dec 2007 05:28:08 +0000 (06:28 +0100)
committerStefan Metzmacher <metze@samba.org>
Fri, 21 Dec 2007 05:28:08 +0000 (06:28 +0100)
(This used to be commit e53723c40cb022903066503e2de3b750c2dc5112)


Trivial merge