Merge branch 'tizen_2.1_smack' into tizen_2.1 tizen_2.1 submit/tizen_2.1/20130514.053109
authorGoo Lee <goo81.lee@samsung.com>
Fri, 10 May 2013 09:46:48 +0000 (18:46 +0900)
committerGoo Lee <goo81.lee@samsung.com>
Fri, 10 May 2013 09:46:48 +0000 (18:46 +0900)

Trivial merge