Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Sun, 19 Oct 2008 11:20:55 +0000 (13:20 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 19 Oct 2008 11:20:55 +0000 (13:20 +0200)
commit99f0d6b1c1bf15716cf20722cd2bf83536614b1c
treee7e44478e237d23e682fbaee7642899d4690f3c0
parentf0c4829e827210e6f58885994e18f77f9afc3b8c
parent9fec173b071d0e4c17db73823bd7c1bdd50ad4d1
Merge branch 'master' of ssh://git.samba.org/data/git/samba