Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Tue, 25 Nov 2008 14:42:47 +0000 (15:42 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 25 Nov 2008 14:42:47 +0000 (15:42 +0100)

Trivial merge