Merge branch 'tizen_2.1_smack' into tizen_2.1 tizen_2.1 accepted/tizen/20130530.164646 accepted/tizen/20130912.185833 accepted/tizen/20130912.194033 accepted/tizen/20130913.030721 submit/tizen/20130529.220718 submit/tizen/20130912.090708 submit/tizen_2.1/20130514.054010
authorJunghyun Kim <jh1114.kim@samsung.com>
Fri, 10 May 2013 08:24:36 +0000 (17:24 +0900)
committerJunghyun Kim <jh1114.kim@samsung.com>
Fri, 10 May 2013 08:24:36 +0000 (17:24 +0900)

Trivial merge