Merge from tizen_2.1_smack. submit/tizen_2.1/20130514.053353
authorKeebum Kim <keebum.kim@samsung.com>
Fri, 10 May 2013 08:32:26 +0000 (17:32 +0900)
committerKeebum Kim <keebum.kim@samsung.com>
Fri, 10 May 2013 08:32:26 +0000 (17:32 +0900)
Change-Id: Ia4ff1c444bbf4027c7f548a2044ed983fe008822


Trivial merge