Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Sun, 19 Oct 2008 09:53:44 +0000 (11:53 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 19 Oct 2008 09:53:44 +0000 (11:53 +0200)
commit58b4efc9b49c1cc366303a306639a3fc9321dcfe
treeb6ed82be41a26ec99d5dae430698bd04c0c9139c
parent452b3e57e9b78dbc2f80d24112540e69fbf13954
parentded09b28dea16ba1f4c8894e33a1ce46153e65a7
Merge branch 'master' of ssh://git.samba.org/data/git/samba