Merge branch 'master' of git://git.samba.org/samba
authorJelmer Vernooij <jelmer@samba.org>
Tue, 21 Oct 2008 14:58:35 +0000 (16:58 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 21 Oct 2008 14:58:35 +0000 (16:58 +0200)

Trivial merge