What is the difference between liberalism and libertarianism?

Note - I don't mean liberal in the US 'bleeding heart liberal' sense, I mean clic/neo-liberal as in Milton Friedman etc. Are libertarians just more extreme in the emphasis they place on individualism and the free market, or are there other differences? Thanks, will give ten points