Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Wed, 16 Apr 2008 16:17:10 +0000 (18:17 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 16 Apr 2008 16:17:10 +0000 (18:17 +0200)
commitb175e7bf16eb26c0bae9731a9147d1d379ca8888
tree157672140db8752982fe99399066133d6f6ffa57
parentdedbeea4d28ae10a15766e38e59593a2799183f3
parenteab5f6a7f5efa8608cb23af2cab8ab19f9f62485
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test