Merge branch 'tizen_2.1_smack' into tizen_2.1 tizen_2.1 accepted/tizen/20130530.164759 submit/tizen/20130529.220615 submit/tizen_2.1/20130514.053133
authorjs411.kim <js411.kim@samsung.com>
Fri, 10 May 2013 09:50:39 +0000 (18:50 +0900)
committerjs411.kim <js411.kim@samsung.com>
Fri, 10 May 2013 09:50:39 +0000 (18:50 +0900)

Trivial merge