Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Wed, 16 Jan 2008 23:32:41 +0000 (10:32 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 16 Jan 2008 23:32:41 +0000 (10:32 +1100)
commitc10992c065b64e3985c8b14d3a4c9ee5f09790c6
tree9e6872f77d7800042c315ff4a09038ce3bb76655
parentd5fd15005c0cad9e9018e81ab5c30b87cb2f605a
parent797e8db3ba1e0038db553af6f564e221479ac381
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit 11660b0737107138b53c3a08e8de30ee44607eae)