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

Trivial merge