Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into cprovision
authorJelmer Vernooij <jelmer@samba.org>
Thu, 10 Apr 2008 03:25:18 +0000 (05:25 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 10 Apr 2008 03:25:18 +0000 (05:25 +0200)
commit3522c7e2cf8c6d6129d941a08adcbe2ecbe0758d
treecb0226f9f47a18c742c2605dedcb580bd70d9ea9
parent98c3d34eb233be284e8c8994cca337be25c72968
parenta13f64bf54afc22516d1f6a786dfec67389cb754
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into cprovision