smack merge from tizen_2.1_smack