Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Wed, 8 Oct 2008 00:21:49 +0000 (02:21 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 8 Oct 2008 00:21:49 +0000 (02:21 +0200)

Trivial merge