Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Wed, 8 Oct 2008 01:39:17 +0000 (03:39 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 8 Oct 2008 01:39:17 +0000 (03:39 +0200)
commit717ef3867a22a5f7427a04083da6cc0b50353bd2
treeaa7a2470c56e988f2403e84bf95d1e6ddd87f882
parentf8a02a1a804fdb8640989595e2b57df86281c0f7
parent859facda89ff3589e87c4cbe1708578769d7c535
Merge branch 'master' of ssh://git.samba.org/data/git/samba