Dew, you will probably have to pay for a condensed tabulation of the detailed data you are seeking. The OECD & IEA keep track of these sorts of statistics. Some of the stuff is free and you can get a free trial access to 6 of OEC subscription databases. http://stats.oecd.org/index.aspx
try looking under 'Country statistical profiles' 2008 'Energy' 'Energy Supply'