Merge "fix PLM issue : P130926-02908" into tizen_2.2