Merge "bug fix for bidi" into tizen_2.1