Proceedings of the X-ray Universe 2005, Vols 1 and 2