[cvs-nhc98] patch applied (yhc): Update to work with GHC 6.8, by including additional packages