synchronization with ics-catalogs branch
synchronization with ics-catalogs branch
rtf: \u command support, code cleanup
Merge branch 'master' into ice-cream-sandwich