Ethiopian journalist released from prison