natecavanaugh/liferay-portal — pull request #304 by juliocamarero (2011-10-24 09:28:43+00:00)
Title: LPS-21898

Resending after fix conflicts and rebase