Merge branch 'master' of git://172.21.111.188/emulator
authorsyeon.hwang <syeon.hwang@samsung.com>
Wed, 14 Mar 2012 10:41:26 +0000 (19:41 +0900)
committersyeon.hwang <syeon.hwang@samsung.com>
Wed, 14 Mar 2012 10:41:26 +0000 (19:41 +0900)

Trivial merge