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)
Conflicts:
source3/Makefile.in


Trivial merge