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)
commitf15b7bf37c5e7cf0c24f3b55416166232095a8e0
tree5e4feebca523c00afba27cdfce7d1f759c407cc9
parentfe9196b20cc1d273825b15db5756dd18332d69c1
parent1b89cc4c198a55b3a7dbdc81193564099aa1a717
merge from tizen_2.1

Change-Id: Ie4f5f52e57c374a77fd2a6fb144758a4b7c4fd02
Signed-off-by: jungmin76.park <jungmin76.park@samsung.com>