There were scenes of celebration in Gaza after an international aid convoy was given the go ahead to enter the territory from Egypt.
Cairo had earlier insisted that the food and other supplies should enter Gaza via an Israeli-controlled checkpoint.
But, after a day of unrest, Egypt reached a deal with members of the convoy, led by the leftist British politician George Galloway.
Some 160 trucks in the aid convoy were allowed to go through the Rafah crossing, but 40 private cars were held back by Egypt.
Clashes broke out over the route the trucks were to take.
Also, an Egyptian soldier was killed in a gun battle during a separate protest over an anti-smuggling wall that Cairo is building in Rafah.
Both Israel and Egypt maintain a blockade on Gaza, which is ruled by the Islamist group Hamas.