Merge branch 'v4-0-test' of /home/jelmer/samba4 into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Sun, 18 May 2008 17:07:17 +0000 (19:07 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 18 May 2008 17:07:17 +0000 (19:07 +0200)
commitb8bbbcab4b58e3c04c37771fe238d57c1f9fbfc2
tree47acd0aa07d046e5259e930d5bdcd7afcd21c585
parent688964c7c67e5188a07dad64f561b2ee28a60cfd
parent4d2f44163e07995949fcf915019e0a6eb7c00b24
Merge branch 'v4-0-test' of /home/jelmer/samba4 into v4-0-test
(This used to be commit ad58defe129d25ea2e8a598934800610189747e8)