Merge "Merge branch 'release' into develop" into develop
authordonghee yang <donghee.yang@samsung.com>
Wed, 5 Sep 2012 12:32:14 +0000 (21:32 +0900)
committerGerrit Code Review <gerrit2@system.s-core.co.kr>
Wed, 5 Sep 2012 12:32:14 +0000 (21:32 +0900)

Trivial merge