Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Sun, 19 Oct 2008 09:53:44 +0000 (11:53 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 19 Oct 2008 09:53:44 +0000 (11:53 +0200)

Trivial merge