merge r23169 from trunk
merge r23169 from trunk

git-svn-id: 8fda60bc762d55c5de1a2e22209e4b69293fb928@23170 f5dbab47-78f9-eb45-b975-e544023573eb

doodelicious/NewsReaderPortlet,doodelicious/NewsReaderPortlet,acolebourne/NewsReaderPortlet,acolebourne/NewsReaderPortlet