tinatian/liferay-portal — pull request #5 by shuyangzhou (2013-06-04 18:57:31+00:00)
Title: Lps 34467

Tina, this branch can no longer rebase, it conflicts with something you changed.

Please rebase it, then send it back to me, I will rename the properties, then push up to brian.