Conflict trends in Africa 1946-2004 : a macro-comparative perspective /