Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Mon, 11 Feb 2008 17:26:28 +0000 (18:26 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 11 Feb 2008 17:26:28 +0000 (18:26 +0100)
commitfc9b9853124c8d172172f88e1e4939db5970df25
tree435d003cc5091a3815a92aaa7fa3a204a7ad4828
parenteff9c9cedd7410c3c089d090e3f83f8cc10f1831
parentdf5b712001c16acf275d9a79fd765cf8976508d6
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial

Conflicts:

source/Makefile
source/rules.mk