Merge branch 'master' of git://172.21.111.188/emulator
authormunkyu.im <munkyu.im@samsung.com>
Wed, 14 Mar 2012 11:14:31 +0000 (20:14 +0900)
committermunkyu.im <munkyu.im@samsung.com>
Wed, 14 Mar 2012 11:14:31 +0000 (20:14 +0900)

Trivial merge