Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Mon, 30 Jun 2008 08:06:02 +0000 (18:06 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 30 Jun 2008 08:06:02 +0000 (18:06 +1000)
commit757acb6802cfb0e98e91e6062c62b6c5a852302b
tree7d2dca6aef3eedf5d6b140476044b8813737ecfd
parent23494a91de6d1c36a5db0d622f707f2c15b3f549
parent861b79c91fb39b6b7f40d57000770f0f839e6c59
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local