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

Trivial merge