Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Sat, 9 Feb 2008 14:04:03 +0000 (15:04 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 9 Feb 2008 14:04:03 +0000 (15:04 +0100)
commitf7521525e42d62e96cc6f55fb1b23644a60fc36d
treefed865bc34f282735e56e602ef961e3f08196504
parent94dedaf6ed55b146a0123407137f7ee4cfd41283
parent41309dc8627e707cee226a76238b9a70d417a345
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial