Merge branch 'develop' into tizen_2.2
authoryongsung1.kim <yongsung1.kim@samsung.com>
Mon, 1 Jul 2013 08:36:53 +0000 (17:36 +0900)
committeryongsung1.kim <yongsung1.kim@samsung.com>
Mon, 1 Jul 2013 08:36:53 +0000 (17:36 +0900)

Trivial merge