Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Wed, 22 Oct 2008 14:57:46 +0000 (16:57 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 22 Oct 2008 14:57:46 +0000 (16:57 +0200)

Trivial merge