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