Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Tue, 23 Dec 2008 22:26:32 +0000 (23:26 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 23 Dec 2008 22:26:32 +0000 (23:26 +0100)
commit53aee922642887531fa79f2d51825af4edb9be41
tree150c54a3798e41b7d25c8519a1a10f3d06a5225c
parent1ec921394faaaec32f0d3c34309f7bb60615c3e8
parent3d07602828035524bec149fe5a6be4654ee07f91
Merge branch 'master' of ssh://git.samba.org/data/git/samba