Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Wed, 23 Jan 2008 04:09:55 +0000 (15:09 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 23 Jan 2008 04:09:55 +0000 (15:09 +1100)
commit56a611b12618ef0224a7a8a12883e0ab8340962d
treed7bdef53981d1131bee032bfd7b1d68b597c6fe2
parent2eab4abf25453a1849adb28d65869c16b2479f57
parent37325c4c1324d6b768bc8f4449a954550333e34d
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit f82eec69f1846aa46e4afe595d956cfd2256c335)