brianchandotcom/liferay-portal — pull request #6698 by topolik (2012-08-29 13:53:05+00:00)
Title: LPS-9442

Hi Brian, I've cut it into isolated commits which can be applied one by one without breaking any functionality.