Merge branch 'tizen_2.1_smack' into tizen_2.1 tizen_2.1 accepted/tizen/20130520.101205 submit/tizen/20130517.045124 submit/tizen_2.1/20130514.052104
authorso.yu <so.yu@samsung.com>
Fri, 10 May 2013 11:45:08 +0000 (20:45 +0900)
committerso.yu <so.yu@samsung.com>
Fri, 10 May 2013 11:45:19 +0000 (20:45 +0900)
Change-Id: I4e90b4fcda068270ce78dba9c292c9511270bc6c
Signed-off-by: so.yu <so.yu@samsung.com>

Trivial merge