Merge branch 'tizen_2.1_smack' into tizen_2.1 submit/tizen_2.1/20130514.055114
authorh2.seo <h2.seo@samsung.com>
Fri, 10 May 2013 11:29:53 +0000 (20:29 +0900)
committerh2.seo <h2.seo@samsung.com>
Fri, 10 May 2013 11:29:58 +0000 (20:29 +0900)
Change-Id: I09ca5b4457333fec771aea427e0753c156d4f74e


Trivial merge