Merge branch 'develop' into tizen_2.2
authoryongsung1.kim <yongsung1.kim@samsung.com>
Wed, 26 Jun 2013 08:28:30 +0000 (17:28 +0900)
committeryongsung1.kim <yongsung1.kim@samsung.com>
Wed, 26 Jun 2013 08:28:30 +0000 (17:28 +0900)

Trivial merge