Merge branch 'v4-0-local' of git://git.id10ts.net/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Sat, 29 Mar 2008 06:19:20 +0000 (17:19 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Sat, 29 Mar 2008 06:19:20 +0000 (17:19 +1100)
commitee6539e4cab8882faafff17f458df91cba352f8e
tree76423f2cecf43d0a70bbda72848b00e886c8a5eb
parente906ae041a2b589ffceff97b74f7c4b01386382a
parent9b4449b46c0404b3c694ac9c592be63185c366b7
Merge branch 'v4-0-local' of git://git.id10ts.net/samba into 4-0-local