Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Thu, 20 Mar 2008 02:25:05 +0000 (13:25 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 20 Mar 2008 02:25:05 +0000 (13:25 +1100)
commit7c4356084a389c3a4edc16f06906ce6127a3a59b
treeeb61fb62bce433a4657a540522b0316ca92dcecc
parent2f2b110fb870132099bad1d4c16ed8962affb3ce
parentb6bb7621053bccc9d06b1b2ee9f71b1b1acf3b70
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local