Merge branch 'v4-0-stable' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Tue, 3 Jun 2008 05:13:28 +0000 (15:13 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 3 Jun 2008 05:13:28 +0000 (15:13 +1000)
commitac94fb0e80709355371f87ae813c7cfa2c7ff2aa
tree3299f9364cd37a8b42d754cd3d8575ecb21783b3
parentb3ec55b98494f9953b1d819166840e61b75b65dd
parent2731e4a3d342d871707dde1dfa1179ae9df253ab
Merge branch 'v4-0-stable' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 7e24ec1430cc14c732ad78f3ce8869931996f6b7)