Merge branch 'v4-0-test' of /home/jelmer/samba4 into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Sun, 18 May 2008 17:37:58 +0000 (19:37 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 18 May 2008 17:37:58 +0000 (19:37 +0200)
commit3a83d4ebd41908aa0f88eec5b05156112ea0ca7b
tree26240553ab677c6d761b59c26e24d0ff99e1f5ae
parent3cff5bc25ad894bef6ed65566d9d692968092760
parentf97bc5735803a73181030e6d7db2862ebc1b7f4b
Merge branch 'v4-0-test' of /home/jelmer/samba4 into v4-0-test