Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Thu, 10 Jul 2008 08:07:51 +0000 (18:07 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 10 Jul 2008 08:07:51 +0000 (18:07 +1000)
commitc98419d3674f2b21c35240cde90ba895e3aea1c8
tree5e6ea62ecbb5ebda9bc7c23e53010d082c5cffbd
parenta5e3c5e236794aef2ccc332449824f4e9a18b09d
parent87f1a6c151aa9c4fd61dda30653b3d7acebbfc5d
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit f956908cde7dd40643ff49cf433d0cf7765027de)