Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Sat, 20 Dec 2008 23:11:50 +0000 (00:11 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 20 Dec 2008 23:11:50 +0000 (00:11 +0100)

Trivial merge