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)

Trivial merge