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)
commit15cf55f9799d806c31a6a4e14a5c77df89dfe35b
tree9fbb0e2c84e6809ad2822522a6dea98c57b95672
parentd947310b94b235a66d32ba9aacd9c13127d45d94
parent1d940e444633bb4f5976888d2581d4ccaf03da21
Merge commit 'origin/v4-0-stable' into v4-0-test