Merge branch 'master' of ssh://git.samba.org/data/git/samba into singlerpc
authorJelmer Vernooij <jelmer@samba.org>
Wed, 17 Sep 2008 17:00:46 +0000 (19:00 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 17 Sep 2008 17:00:46 +0000 (19:00 +0200)
commit87e4e0e9406a4805c0116652b2ea34114acc279a
treecdc67a526490daed41730599dd55bad052fdee4d
parent661d25402ecb36a35bee6b282440854f5280781a
parentf4293618a712ca7ce59b7d695e2e3d918ddbb542
Merge branch 'master' of ssh://git.samba.org/data/git/samba into singlerpc

Conflicts:
source3/Makefile.in