Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-python
authorJelmer Vernooij <jelmer@samba.org>
Mon, 11 Feb 2008 12:10:11 +0000 (13:10 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 11 Feb 2008 12:10:11 +0000 (13:10 +0100)
commite4165448d778db1721b1c7670b25ae3e40917d86
tree027b825fa742c1dbb97874c179cdeea6dba92a58
parentcac225ba7daf8d88d858292902480415f0fa00e2
parentde03c4a3eadd8180e5bda5b176f1abebff613a15
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-python
(This used to be commit 35f5c8294e9f3b304987597d4bcfc75fdda05982)