Just wanted to chime in and add that (for mac users) Final Cut Pro X has some pretty nice built-in surround sound tools.
Not only can it up-convert to surround sound, it has a sound stage you can play with each individual audio "track" as to how it maps to the various surround channels. It's got a bunch of presets (for example, "ambience," "dialog," music"), and also lots of sliders, etc. to customize things. Most of it is way beyond my level of expertise, but it's there for people who know what they are doing. ;-)
Not only can it up-convert to surround sound, it has a sound stage you can play with each individual audio "track" as to how it maps to the various surround channels. It's got a bunch of presets (for example, "ambience," "dialog," music"), and also lots of sliders, etc. to customize things. Most of it is way beyond my level of expertise, but it's there for people who know what they are doing. ;-)