Merge branch 'v4-0-test' of /home/jelmer/samba4 into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Sun, 18 May 2008 16:55:38 +0000 (18:55 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 18 May 2008 16:55:38 +0000 (18:55 +0200)
commit688964c7c67e5188a07dad64f561b2ee28a60cfd
tree597e25c47f6c71db77ce0500047b3bf987020fac
parent65f365d2ecccc5f0a1fb7c5140e5eade74ac9f08
parent98154fdf05b725a9b7d7bdcd572a165c3fa865c1
Merge branch 'v4-0-test' of /home/jelmer/samba4 into v4-0-test
(This used to be commit 84c9fbe8466e013e501eecf9b2e7981c1df8232c)