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

Trivial merge