Margarito's supposed to be fighting Joshua Clottey (28-1, 18 KO's). From what I've seen of Clottey he's pretty solid.

interview with Arum who says its pretty much a done deal

http://boxingtalk.com/pag/article8092.html