If you're making a panorama for non commercial use, Microsoft Research's ICE (Image Composite Editor) works quite well. If you've installed Canon's RAW codec it can even read the .CR2 files directly.