Merge "Sync-up with latest release source code." into develop
authorYeongkyoon Lee <yeongkyoon.lee@samsung.com>
Mon, 4 Mar 2013 02:42:54 +0000 (11:42 +0900)
committerGerrit Code Review <gerrit2@system.s-core.co.kr>
Mon, 4 Mar 2013 02:42:54 +0000 (11:42 +0900)

Trivial merge