Merge branch 'tizen_2.1_smack' into tizen_2.1 submit/tizen_2.1/20130514.053805
authorjs411.kim <js411.kim@samsung.com>
Fri, 10 May 2013 09:54:16 +0000 (18:54 +0900)
committerjs411.kim <js411.kim@samsung.com>
Fri, 10 May 2013 09:54:16 +0000 (18:54 +0900)

Trivial merge