Merge branch 'tizen_2.1_smack' into tizen_2.1