Merge branch 'master' of git://172.21.111.188/emulator
authormunkyu.im <munkyu.im@samsung.com>
Wed, 7 Mar 2012 07:00:21 +0000 (16:00 +0900)
committermunkyu.im <munkyu.im@samsung.com>
Wed, 7 Mar 2012 07:00:21 +0000 (16:00 +0900)

Trivial merge