brianchandotcom/liferay-portal — pull request #4300 by amosfong (2012-02-23 09:56:58+00:00)
Title: LPS-25715

please backport to 6.1 for licensing