[TRA]Conflict resolved

git-svn-id: file:///var/local/code.tiki.org/tikisvn/trunk@47707 b456876b-0849-0410-b77d-98878d47e9d5