Merge branch 'master' of ssh://git.samba.org/data/git/samba into crypto
authorJelmer Vernooij <jelmer@samba.org>
Wed, 24 Sep 2008 14:11:13 +0000 (16:11 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 24 Sep 2008 14:11:13 +0000 (16:11 +0200)

Trivial merge