Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Tue, 23 Dec 2008 00:03:49 +0000 (01:03 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 23 Dec 2008 00:03:49 +0000 (01:03 +0100)
commitd26cde4da67feb2ae079fa7bb4aa4fd588939953
treed33a9eda076456b898233d54e5d984b1c819c2d1
parent07bdb454e2e24aa16064ee26c1c03cd2b0dc3950
parent50feca550eed7828198b7c0fc5f0e5ddc863313d
Merge branch 'master' of ssh://git.samba.org/data/git/samba