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)
commita626a9c69cb2c07c8de69dcfe45361f86d6de58d
tree85fa1c7af77f3da116fe7f2700fef5ed05f4e8dc
parent40c93ffbe9eb09a5b3dc02ba56d28bf50df8ed82
parent9013748273378f88bfc66d3583814f0fee67c40f
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test

Conflicts:

source/ntvfs/ntvfs_generic.c