Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Wed, 30 Jul 2008 21:48:16 +0000 (07:48 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 30 Jul 2008 21:48:16 +0000 (07:48 +1000)
commit15d0951b74b46763024560f9cd012338473c5bc3
tree3fdcd1959c1977a709bed8b842653d91e539c312
parent736ce50afd9da9b5fbc3db777fd5341dfa4b721a
parent9678085f75b6cb0ed068e22f3d9f94247b200ce2
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local