Merge "emulator: move functions to prepare_maru()" into develop
authorYeongkyoon Lee <yeongkyoon.lee@samsung.com>
Tue, 15 Jan 2013 09:25:23 +0000 (18:25 +0900)
committerGerrit Code Review <gerrit2@system.s-core.co.kr>
Tue, 15 Jan 2013 09:25:23 +0000 (18:25 +0900)

Trivial merge