Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Mon, 3 Mar 2008 00:12:20 +0000 (11:12 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 3 Mar 2008 00:12:20 +0000 (11:12 +1100)
commit4550c3f470c7e6cb1419f318231301df896a5d1c
tree8e975d8514a7f8bf105bdb6207074f47f15ccddf
parentc20cf59768d585baf4524c54dadba1ec60673894
parenta1ff86dbabff836b95a725d81dc6f325bbc20813
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit de1784ec4d50f6eec24b1e9e488b5c07833dc1fd)