The border dispute between Cambodia and Thailand has a long and complex history, but recent tensions were reignited by the tragic death of a Cambodian soldier on May 28.