Merge branch 'master' of git://172.21.111.188/emulator
authorSon Hyunjun <hj79.son@samsung.com>
Wed, 14 Mar 2012 14:15:17 +0000 (23:15 +0900)
committerSon Hyunjun <hj79.son@samsung.com>
Wed, 14 Mar 2012 14:15:17 +0000 (23:15 +0900)

Trivial merge