Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Fri, 24 Oct 2008 02:19:08 +0000 (04:19 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 24 Oct 2008 02:19:08 +0000 (04:19 +0200)

Trivial merge