Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Mon, 5 Jan 2009 13:02:30 +0000 (14:02 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 5 Jan 2009 13:02:30 +0000 (14:02 +0100)
1  2 
source3/smbd/nttrans.c

Simple merge