Merge branch 'develop' into release
authordev.sungmin.kim <dev.sungmin.kim@samsung.com>
Wed, 5 Sep 2012 02:24:02 +0000 (11:24 +0900)
committerdev.sungmin.kim <dev.sungmin.kim@samsung.com>
Wed, 5 Sep 2012 02:24:02 +0000 (11:24 +0900)

Trivial merge