Merge from tizen_2.1 into tizen_2.2
authorso.yu <so.yu@samsung.com>
Wed, 5 Jun 2013 06:16:54 +0000 (15:16 +0900)
committerso.yu <so.yu@samsung.com>
Wed, 5 Jun 2013 06:17:02 +0000 (15:17 +0900)
Change-Id: I3db3be73de51e63811f83d01501c4f5c7b009c49
Signed-off-by: so.yu <so.yu@samsung.com>

Trivial merge