Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Wed, 23 Jul 2008 06:15:46 +0000 (16:15 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 23 Jul 2008 06:15:46 +0000 (16:15 +1000)
commit532ccbbe7aa360440f455dfa136f425b9996e998
tree50d9622c0a3fdb45685ce051b135945c28a9759b
parentf8628fa330abcd50923d995d5bda1f4811582ea9
parentb91bbc5fe4a47e5823be6be5f2f203f1f14105de
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local