Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Tue, 18 Nov 2008 00:36:02 +0000 (01:36 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 18 Nov 2008 00:36:02 +0000 (01:36 +0100)

Trivial merge