Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Thu, 17 Apr 2008 07:36:09 +0000 (09:36 +0200)
committerAndrew Tridgell <tridge@samba.org>
Thu, 17 Apr 2008 07:36:09 +0000 (09:36 +0200)
commit30b9c37420100c98df1a538673d508e46517accf
tree33ccf13461371c1281a0fc707e66a814a3bc88e9
parent4bbaf36f6fd85c9d07a16320ad58d7a6ad43fd6c
parentbaad7a7e56e2b0f24885e01672cd9bdc6667a6a8
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test

Conflicts:

source/ntvfs/ntvfs_generic.c
(This used to be commit a626a9c69cb2c07c8de69dcfe45361f86d6de58d)