Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Sat, 5 Jan 2008 03:06:37 +0000 (19:06 -0800)
committerJeremy Allison <jra@samba.org>
Sat, 5 Jan 2008 03:06:37 +0000 (19:06 -0800)
1  2 
source/client/client.c

Simple merge