Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Thu, 18 Sep 2008 16:41:23 +0000 (18:41 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 18 Sep 2008 16:41:23 +0000 (18:41 +0200)
commit75b59c9b31d1a69ab58770d8741e15a894a1cad3
tree13a43fb86f2dce06016bbf256e993448dc677f05
parente9429a2abe06c20e5e4582febe8e6c0a20756e48
parent5b827dfd8b20e4c268a594e733765bef147020fb
Merge branch 'master' of ssh://git.samba.org/data/git/samba