Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Tue, 15 Jan 2008 22:00:04 +0000 (09:00 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 15 Jan 2008 22:00:04 +0000 (09:00 +1100)
commitc92a1d0752abf42a76e16e7c19229841ac35dc81
treef5702890d17180c6b33285c14b05bc53b0ca629c
parent955b110818c00170f7b93d2975de467551c8bc06
parentb1fcae724156c2b25f41264943cf4cec8fe68821
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit d8a805a2544c8864136f77e9086b2a01ae79a1d5)