Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Wed, 27 Feb 2008 18:37:45 +0000 (19:37 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 27 Feb 2008 18:37:45 +0000 (19:37 +0100)
commitc0481904af6cb18041f0790f23c6763617a35366
tree24403216c11831819f95f11a1510c21dfe70c3e6
parent80d1d2a4db91eba72a4a8da0ed89691f8c25d97f
parent6d184c70caf4dd832102f83a50409d4aa12cc2f4
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 91980a2bd352f26cf6ddb058d0f330ca20fa6554)