Merge commit 'origin/v4-0-stable' into v4-0-test
authorStefan Metzmacher <metze@samba.org>
Wed, 2 Jul 2008 13:43:57 +0000 (15:43 +0200)
committerStefan Metzmacher <metze@samba.org>
Wed, 2 Jul 2008 13:43:57 +0000 (15:43 +0200)
commitb8d3ef1772c319cdc468522ea5355d0d689ef5f1
tree1c7b1155c95751d580c4d87d1ca34b4e13f9eeb6
parentb4b303b5ce172173a138865e6a69c0f039c833b4
parentfad5b6cd8901532716c8112b4f4b6fd078900217
Merge commit 'origin/v4-0-stable' into v4-0-test
(This used to be commit 91c899290f6962f277c103f11d5d8dc0a7c9aa02)