Merge commit 'release-4-0-0alpha15' into master4-tmp
authorStefan Metzmacher <metze@samba.org>
Fri, 24 Jun 2011 07:39:33 +0000 (09:39 +0200)
committerStefan Metzmacher <metze@samba.org>
Fri, 24 Jun 2011 07:39:33 +0000 (09:39 +0200)

Trivial merge