Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Sat, 28 Jun 2008 12:04:19 +0000 (22:04 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Sat, 28 Jun 2008 12:04:19 +0000 (22:04 +1000)
commit43bf8f4546c94d19c4bb203835e91c640b553116
treea6707ff36ed0a8f6ab0e7d9d663d9f1d785c6666
parentb5808e5d65ef100a4a54e720ab4f4e1ffd80a057
parent98014c5668e3269a059658e433d636213e2b06e6
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 6479f481dbf2f5c83edec0702ece73e83b6c810e)