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

Trivial merge