Halle Berry's ex-boyfriend Gabriel Aubry has been reunited with his daughter for first time since a nasty Thanksgiving Day (22Nov12) fight with the actress' fiance Olivier Martinez.

Aubry and Martinez clashed outside Berry's Los Angeles home and the Monster's Ball star obtained a temporary restraining order to keep her former partner away from her and their four-year-old child, Nahla.

The protective order expired on Thursday (29Nov12) and Aubry's own restraining order against Martinez was also lifted this week (ends02Dec12), while Berry's lawyer revealed "an amicable agreement" had been reached between the two sides.

Tensions have now simmered down enough for Aubry to see his little girl. He was pictured walking in Los Angeles with Nahla on Friday (30Nov12).

The bad blood between the trio reportedly stems from a bitter custody dispute over Nahla - Berry wants to emigrate to France with Martinez and take her daughter with her, while Aubry is resisting the move.