Merge branch 'master' of git://git.samba.org/samba
authorJelmer Vernooij <jelmer@samba.org>
Wed, 15 Oct 2008 15:19:46 +0000 (17:19 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 15 Oct 2008 15:19:46 +0000 (17:19 +0200)
commit5437ad822578a9b620f645899c636cde004aa1e8
tree7620b2db0bfb702ff2cce6fa8bcbd8b9896180b6
parent915f1df9047cbc6bcd5bbec891cd56579cb4e884
parent65dc1eecebf664e26e87c70f9b5c8640d5535493
Merge branch 'master' of git://git.samba.org/samba