hhuijser/liferay-portal — pull request #666 by sherryre (2012-06-04 19:13:31+00:00)
Title: Fix for LPP3221 and LPS-27550

Fix for LPP3221 and LPS-27550, please review.

Thanks!