Merge branch 'tizen_2.1_smack' into tizen_2.1 submit/tizen_2.1/20130514.053812
authorJin Yoon <jinny.yoon@samsung.com>
Fri, 10 May 2013 11:59:41 +0000 (20:59 +0900)
committerJin Yoon <jinny.yoon@samsung.com>
Fri, 10 May 2013 11:59:41 +0000 (20:59 +0900)

Trivial merge