Although some see them as opposing forces within a similar frame of interest, I see them as two sides of the same coin, and am deeply passionate about both.
Free software (some call it "libre") lets you see and use the source code.
Proprietary does not let you do either.
Some software makers call their software "open-source" when it's really free, and some call their software "free" when it's really just "open".
I tend to explain the difference as being that Open Source places the freedom of people first (e.g. with a BSD licence, developers have freedom to do anything with a piece of code) and Free Software places the freedom of software first.
(I don't project any moral judgement of either of these goals, I think they both have their place. Also hi! ;)
http://www.gnu.org/philosophy/free-software-for-freedom.html