hhuijser/liferay-portal — pull request #788 by kennyshiu-liferay (2012-08-07 18:00:30+00:00)
Title: Lps 27848

Re-did the fix according to Nate's suggestions