Merge branch 'master' of ssh://git.samba.org/data/git/samba into regsrv
authorJelmer Vernooij <jelmer@samba.org>
Tue, 21 Oct 2008 13:53:28 +0000 (15:53 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 21 Oct 2008 13:53:28 +0000 (15:53 +0200)

Trivial merge