Merge branch 'master' of git://172.21.111.188/emulator
authorsyeon.hwang <syeon.hwang@samsung.com>
Wed, 7 Mar 2012 09:31:00 +0000 (18:31 +0900)
committersyeon.hwang <syeon.hwang@samsung.com>
Wed, 7 Mar 2012 09:31:00 +0000 (18:31 +0900)

Trivial merge