Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Mon, 13 Oct 2008 14:30:40 +0000 (16:30 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 13 Oct 2008 14:30:40 +0000 (16:30 +0200)

Trivial merge