Merge commit 'origin/v3-0-stable' into v3-0-test
authorStefan Metzmacher <metze@samba.org>
Wed, 21 Nov 2007 14:47:21 +0000 (15:47 +0100)
committerStefan Metzmacher <metze@samba.org>
Wed, 21 Nov 2007 14:47:21 +0000 (15:47 +0100)
commit9082329241d23665770ad82c77c2707bf434d126
tree0cca5acb18d86d11dd0bda4a36d998f09f0ce420
parent761876cdfd3805575de422a51fa1514edefea160
parent2b4189175a4e54c922136dbfb35c276730a4039a
Merge commit 'origin/v3-0-stable' into v3-0-test