Merge branch 'master' of ssh://git.samba.org/data/git/samba into charcnv-merge
authorAndrew Bartlett <abartlet@samba.org>
Tue, 24 Mar 2009 21:19:23 +0000 (08:19 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 24 Mar 2009 21:19:23 +0000 (08:19 +1100)
commitc0187adef158d190fe5ad7f81c41f562864fa5e7
treefb54b777cb5cd580427e21a3b8777868316a3822
parent7cffd74181bd94d4151f36a7dbda7da9628cf315
parentc653e8daaf3e842544d7f9561557d1ab9449971c
Merge branch 'master' of ssh://git.samba.org/data/git/samba into charcnv-merge
source3/Makefile.in
source3/include/proto.h