Merge branch 'tizen_2.1_smack' into tizen_2.1 tizen_2.1 accepted/tizen/20130530.164758 submit/tizen/20130529.220618 submit/tizen_2.1/20130514.053230
authorGoo Lee <goo81.lee@samsung.com>
Fri, 10 May 2013 09:56:14 +0000 (18:56 +0900)
committerGoo Lee <goo81.lee@samsung.com>
Fri, 10 May 2013 09:56:14 +0000 (18:56 +0900)

Trivial merge