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)
commit02b8a860d3813c0fc9e5045af524598a023ba8f5
tree927f560145a025b9266d6e14a180ee061b114863
parent3ca429357c6bb4ac2d7cc5ff9e781406e9bbdca4
parent1e1adbefd1c2e0e9bbddfebdb69dfd6de95042a4
merge from tizen_2.1

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