Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Fri, 8 Feb 2008 23:00:14 +0000 (10:00 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 8 Feb 2008 23:00:14 +0000 (10:00 +1100)
commit0ca20977ef5a228bc0240fb516af6af68ae3b2de
treee8447e8acf1dafb9e38be3ea82bb37228ebe1061
parentb2d47f9794bc805051fde55f1f94d29db96c6a62
parent1f974c8aa7e21bd663bc4fd639d845f63e68e241
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit 1bf9d0401012cd3c830d50844f5be35e53835322)