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 02:11:04 +0000 (03:11 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 9 Feb 2008 02:11:04 +0000 (03:11 +0100)
commitd4fb8b0d8644cddfa39655fac87a96edc71b2a73
treece19b40979e86a536f90b129786815e1ef1e013b
parentb173fa6bd2b24b5a3e7b4fbcb926f6c9771c10ba
parent1bf9d0401012cd3c830d50844f5be35e53835322
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial