2004 WARRANT AND REGISTRATION RIGHTS AGREEMENT DATED AS OF JUNE 18, 2004 WARRANT AND REGISTRATION RIGHTS AGREEMENT