My CD copy also says that they're one track, as does my iPod. I would have voted for Into The Heart had it been on here.
I'm not sure where I stand on the two different songs vs. one song, but I don't think just being on track makes something the same song. Songs that fade into each other on albums are not the same song (like Brain Damage/Eclipse on Pink Floyd's Dark Side of the Moon).