natecavanaugh/liferay-portal — pull request #303 by sergiogonzalez (2011-10-24 08:12:30+00:00)
Title: Lps 22030

Rebased with Master :)