ovclas f7330acf02 reverse merge from 1.6.0 (r10668, r10667, r10600, r10596, r10595, r10594, r10578, r10572) ... git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10717 201d5d3c-b55e-5fd7-737f-ddc643e51545		2012-05-17 06:27:55 +00:00
..
emoticon
image_gallery
image_link
multimedia_link
poll_maker