Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Thu, 10 Jan 2008 19:39:02 +0000 (20:39 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 10 Jan 2008 19:39:02 +0000 (20:39 +0100)
commitad9089c413bfac6dddda5e837d7143fe7a2c29fb
treedaf5fd14514ded07d8ab1d936815952b09f0956e
parentbd4ce069b4b6d3fdc182b16060c20e6fe8e8a87d
parentdec016822ce9439b40f3d9403d42ebc76ba2e0e1
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial