hhuijser/liferay-portal — pull request #220 by AngeloJ (2011-10-21 01:27:04+00:00)
Title: Lps 21930

For more information consult LPP-2033, which has the original fix proposed by Neil Griffin. I broke this commit up into two parts to make it easier to read. LPS-21930 Fixes that issue and LPS-14182 corrects a mistake made on that LPS.