Merge branch 'release-1.0' of gerrithost:/sdk/emulator/emulator-manager into release-1.0
authorsyeon.hwang <syeon.hwang@samsung.com>
Wed, 4 Apr 2012 03:35:25 +0000 (12:35 +0900)
committersyeon.hwang <syeon.hwang@samsung.com>
Wed, 4 Apr 2012 03:35:25 +0000 (12:35 +0900)

Trivial merge