Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Mon, 22 Dec 2008 20:15:59 +0000 (21:15 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 22 Dec 2008 20:15:59 +0000 (21:15 +0100)
commit99e637175c0dee050b9c39c124ab1fab8ad7976d
tree60f9f6557297031d293e490a12abcde33c4350fa
parentc023828962d7050668c38129170121cc50cd300f
parentf1389a39508735bd3133bac9da5eee3c73342d1f
Merge branch 'master' of ssh://git.samba.org/data/git/samba