Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Wed, 8 Oct 2008 00:21:49 +0000 (02:21 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 8 Oct 2008 00:21:49 +0000 (02:21 +0200)
commit99b2089752e202adbf4113b1854636e1db2f97c7
treed5f4be4c26a1f39fc91beeebb75044d2ced89d41
parent68837ff597bd39ff215ef30b4616692d2e31b1b4
parent2024d87cf5ffa0633225ed189fa48f0f56151e7e
Merge branch 'master' of ssh://git.samba.org/data/git/samba