Merge branch 'tizen_2.1_smack' into tizen_2.1 tizen_2.1 2.2_release submit/tizen_2.1/20130514.055130 submit/tizen_2.2/20130714.154539
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