Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Sat, 25 Oct 2008 22:41:34 +0000 (00:41 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 25 Oct 2008 22:41:34 +0000 (00:41 +0200)

Trivial merge