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)
commit8da3c72e5841ff6416d64a9375fda7305f12ef58
tree8025b5a765ac657c90682513bf4115eb9f5b21cf
parentf78c5e2c72be912f2f05a07f98a8e1e3619539c7
parent69964a24d735dd59c1b95b9c5bb93b4c06b4cfea
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 757acb6802cfb0e98e91e6062c62b6c5a852302b)