natecavanaugh/liferay-portal — pull request #344 by sergiogonzalez (2011-11-04 13:30:27+00:00)
Title: LPS-20891

LPS-20891 and LPS-20892