brianchandotcom/liferay-portal — pull request #6386 by michaelhashimoto (2012-08-07 21:59:35+00:00)
Title: master-mh-179

http://issues.liferay.com/browse/LIFERAYQA-840
http://issues.liferay.com/browse/LIFERAYQA-1794

http://issues.liferay.com/browse/SOS-1174
http://issues.liferay.com/browse/SOS-1173