Merge branch 'master' of git://172.21.111.188/emulator
authorsyeon.hwang <syeon.hwang@samsung.com>
Thu, 8 Mar 2012 12:00:55 +0000 (21:00 +0900)
committersyeon.hwang <syeon.hwang@samsung.com>
Thu, 8 Mar 2012 12:00:55 +0000 (21:00 +0900)

Trivial merge