Merge branch 'master' of ssh://git.samba.org/data/git/samba into charcnv-merge
authorAndrew Bartlett <abartlet@samba.org>
Sun, 22 Mar 2009 21:29:57 +0000 (08:29 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Sun, 22 Mar 2009 21:29:57 +0000 (08:29 +1100)
commit9d5250b117d0ef8af5dc82fe864fd4e2041b3659
treed0dd697408357f498438d1fe0691babdecf3c040
parenta37e61ca5d47064641b370e3955b589b34ac66c4
parent979a1b06d01817a01967d9137e4f70f222fa8eab
Merge branch 'master' of ssh://git.samba.org/data/git/samba into charcnv-merge
source3/Makefile.in
source3/include/proto.h
source3/libads/kerberos.c
source3/libsmb/clikrb5.c
source3/printing/nt_printing.c