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)
commit7e24ec1430cc14c732ad78f3ce8869931996f6b7
tree4780ebe0bf75e01c38b04ce8cea5fa3c689261d2
parent58f66184f0f732a78e86bbb0f3c29e920f086d08
parentf9ef7009bc73e3ee27f0ef32d6983bc9286d7e4d
Merge branch 'v4-0-stable' of ssh://git.samba.org/data/git/samba into 4-0-local