Use freeciv from S2_5 branching point (trunk r22812)