Merge remote-tracking branch 'kiran/tizen_2.3b' into tizen_2.3