Interesting discussion Graham — seems to me there are a lot of possible permutations here!

From a personal perspective, the two are rather entwined... in the pursuit and discovery of happiness, there comes an attendant freedom. I take some series of steps that lead to my being happy, and that turns out to be really freeing! In most aspects of culture, I think people think of "happiness" as a goal to seek and attain... and unless you're somehow a prisoner (not just behind bars, but in an emotional/psychological jail, as well), we seldom seek freedom... we seek happiness, and freedom is a joyous consequence.