Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Mon, 27 Oct 2008 22:41:48 +0000 (23:41 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 27 Oct 2008 22:41:48 +0000 (23:41 +0100)

Trivial merge