Yes, you can just use a 2004 tax form and file all your W-2's from both years on there. I believe the same goes for state too.