Merge branch 'tizen_2.1_smack' into tizen_2.1 tizen_2.1 accepted/tizen/20130530.164833 submit/tizen/20130529.220533 submit/tizen_2.1/20130514.053619
authorJungmin Kim <jm15.kim@samsung.com>
Fri, 10 May 2013 11:25:11 +0000 (20:25 +0900)
committerJungmin Kim <jm15.kim@samsung.com>
Fri, 10 May 2013 11:25:11 +0000 (20:25 +0900)

Trivial merge