Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Thu, 21 Feb 2008 00:07:06 +0000 (01:07 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 21 Feb 2008 00:07:06 +0000 (01:07 +0100)
commit1bb673ce4e84088bc77d490101e8904cf9a467a2
tree0b47b765ad9c5afc47fa6dadbd0096e4dcb7339e
parente8751e513d5f9b30e518104bbc23bcbd203818a6
parentb1d2584277304be3f2a640465cbf6b2a3ec571cc
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial