Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into registry
authorJelmer Vernooij <jelmer@samba.org>
Tue, 15 Apr 2008 20:08:49 +0000 (22:08 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 15 Apr 2008 20:08:49 +0000 (22:08 +0200)
commit70ebb22c3df178a26c26c0a25c5722ff9ccdb0b4
tree5cff9cddff0480fbecbf8ee8b28782f5c23ded5f
parent6ec206ba58777395b2d1251680b21648f4c0f78e
parentb9cac469f3c869a26f415a6c551cf6e8fbb06ed6
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into registry