Merge branch 'master' of ssh://git.samba.org/data/git/samba into crypt
authorJelmer Vernooij <jelmer@samba.org>
Mon, 20 Oct 2008 08:53:56 +0000 (10:53 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 20 Oct 2008 08:53:56 +0000 (10:53 +0200)

Trivial merge