Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Mon, 21 Jan 2008 11:01:32 +0000 (22:01 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 21 Jan 2008 11:01:32 +0000 (22:01 +1100)
commitb99b604a5f8b7eb98a6285145188c0b94946df78
treefd2d81406799dc192e96bd062e98a18c389d3f48
parent70c1e918e6bd01946425e2d89cb680f14152f9fc
parentc04cf0c0520ae35ebe173d733d5dc8ffa5bf4ed9
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local