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

Trivial merge