Merge branch 'dev' into tizen_2.2
authoryongsung1.kim <yongsung1.kim@samsung.com>
Thu, 20 Jun 2013 13:02:22 +0000 (22:02 +0900)
committeryongsung1.kim <yongsung1.kim@samsung.com>
Thu, 20 Jun 2013 13:02:22 +0000 (22:02 +0900)

Trivial merge