Conflict Trends in Africa, 1946–2004