Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Tue, 16 Dec 2008 21:59:18 +0000 (22:59 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 16 Dec 2008 21:59:18 +0000 (22:59 +0100)
commitaf138af9e25cb9a362f8a67018645cfb30446d5a
tree3dbef05541f1d3aae3b6d36e60bafa75dab5085b
parent97f372003869e8ad1f4e2f673c59f7f0d563346a
parent3144e4508505d03540347879c816ac723c6af158
Merge branch 'master' of ssh://git.samba.org/data/git/samba