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)
commit7c1fdfe4b5f7dbe215a04f2c5ecb82a410ac10f8
treed8ff9774916e84dbc568f77edd4925b1f6b51735
parent0500b87092540d300b4e021a0fb95ce16a44fbd2
parentc27f79433dcd5ae56eef2e371e0e61180cbee121
Merge commit 'release-4-0-0alpha2' into v4-0-test
(This used to be commit e53723c40cb022903066503e2de3b750c2dc5112)