Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Wed, 27 Feb 2008 15:03:00 +0000 (16:03 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 27 Feb 2008 15:03:00 +0000 (16:03 +0100)
commit48e9b4cea10ad182af5fd4260ca1b7403fcfbf3a
treef204e65c0ab980834f314d13ce6b32721c8b7f66
parent3101cb888d5cbad785050b8491b138d683d444fb
parentb42e3fb232ca68e869de4b39826da861f48e6771
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
(This used to be commit d96fcc52a70fd1236b767b1d88a39d78c4e8c48c)
source4/ntvfs/posix/pvfs_rename.c
source4/smbd/server.c