Merge commit 'origin/v4-0-stable' into v4-0-test
authorStefan Metzmacher <metze@samba.org>
Sat, 29 Mar 2008 07:34:10 +0000 (08:34 +0100)
committerStefan Metzmacher <metze@samba.org>
Sat, 29 Mar 2008 07:34:10 +0000 (08:34 +0100)
commit5a498290b0f48befe35c4a5a60f66713df0c8f18
tree3a2a93e60cc9e062868b2409db81c21a84f66103
parent3237b14e3fe1b43d86e57283d049b1963b2a084b
parente2bfcac09c24886fb2fe5b084b105bf6bd3219a8
Merge commit 'origin/v4-0-stable' into v4-0-test
(This used to be commit 15cf55f9799d806c31a6a4e14a5c77df89dfe35b)