hhuijser/liferay-portal — pull request #774 by dougwong (2012-08-01 01:07:36+00:00)
Title: LPS-28387

Pushing to trunk for code consistency with 6.1.x