Paper presented at the International Workshop on Energy Modelling organised by the IEA/OECD, Paris, France, November 17-19.