oracle
committed
on 20 Jan 02
fix conflict - still broken
/catalog/search.ru_RU.utf-8.xml (deleted)
No Change