merge from tizen_2.1
authorjungmin76.park <jungmin76.park@samsung.com>
Wed, 5 Jun 2013 05:40:51 +0000 (14:40 +0900)
committerjungmin76.park <jungmin76.park@samsung.com>
Wed, 5 Jun 2013 05:40:51 +0000 (14:40 +0900)
Change-Id: Ie4f5f52e57c374a77fd2a6fb144758a4b7c4fd02
Signed-off-by: jungmin76.park <jungmin76.park@samsung.com>

Trivial merge