Merge branch 'tizen_2.1_smack' into tizen_2.1 tizen_2.1 accepted/tizen/20130530.164548 accepted/tizen/20130912.185446 accepted/tizen/20130912.193706 accepted/tizen/20130913.031352 submit/tizen/20130529.220737 submit/tizen/20130912.090759 submit/tizen_2.1/20130514.055130
authorjs411.kim <js411.kim@samsung.com>
Fri, 10 May 2013 09:55:28 +0000 (18:55 +0900)
committerjs411.kim <js411.kim@samsung.com>
Fri, 10 May 2013 09:55:28 +0000 (18:55 +0900)

Trivial merge