Merged from tizen_2.1_smack