Merge branch 'tizen_2.1_smack' into tizen_2.1 tizen_2.1 submit/tizen_2.1/20130514.052111
authorso.yu <so.yu@samsung.com>
Fri, 10 May 2013 11:45:54 +0000 (20:45 +0900)
committerso.yu <so.yu@samsung.com>
Fri, 10 May 2013 11:46:02 +0000 (20:46 +0900)
Change-Id: Icaa1eee0da9dc23ad980a9b1b95fff142bf65120
Signed-off-by: so.yu <so.yu@samsung.com>

Trivial merge