Merge branch 'release' into develop
authordev.sungmin.kim <dev.sungmin.kim@samsung.com>
Tue, 4 Sep 2012 12:06:46 +0000 (21:06 +0900)
committerdev.sungmin.kim <dev.sungmin.kim@samsung.com>
Tue, 4 Sep 2012 12:06:46 +0000 (21:06 +0900)

Trivial merge