Concurrency for Parallelism?

So, following up on the previous post, what is the difference between concurrent programming and parallel programming?