Merge remote-tracking branch 'origin/tizen_2.1_smack' into tizen_2.1