Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into upstream upstream
authorJelmer Vernooij <jelmer@samba.org>
Wed, 9 Apr 2008 14:19:25 +0000 (16:19 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 9 Apr 2008 14:19:25 +0000 (16:19 +0200)
commit71a31067e42df22b05aff149897fc99b223a761e
treea0749d76ab1c2212162ce46721f6e6adcc232055
parent562b1310d5c15c7816e5779f2f5738d6a2c0fbee
parent596fc05785020cd7bd6d15d91b49172039f83bab
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into upstream