Merge branch 'tizen_2.2' into develop
authoryongsung1.kim <yongsung1.kim@samsung.com>
Mon, 24 Jun 2013 07:38:45 +0000 (16:38 +0900)
committeryongsung1.kim <yongsung1.kim@samsung.com>
Mon, 24 Jun 2013 07:38:45 +0000 (16:38 +0900)

Trivial merge