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)
commit35f5c8294e9f3b304987597d4bcfc75fdda05982
tree0e7bdd18a8169601ff7f361014be6cb2310af392
parentea07509b4a9335a3b3fe6f6da1124fd1aab33c96
parent4557b34d82e16038db903278ea64313a9d731d61
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-python