Merge branch 'develop' of rsa-git:sdk/emulator/qemu into develop
authorKitae Kim <kt920.kim@samsung.com>
Fri, 26 Oct 2012 07:15:40 +0000 (16:15 +0900)
committerKitae Kim <kt920.kim@samsung.com>
Fri, 26 Oct 2012 07:15:40 +0000 (16:15 +0900)
commitf7a67579ff24e5832df1c1855c494c1730f7106c
treedac118efd6a21c67863f1292e5c2170d8f9b6b0b
parentaf07aba3e0339340d0fbaaf0fcfda63098265cdb
parent7aa08f6753da9309e1bf516a497d5e5dacedb83e
Merge branch 'develop' of rsa-git:sdk/emulator/qemu into develop

Conflicts:
tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
tizen/src/skin/client/src/org/tizen/emulator/skin/image/ImageRegistry.java