Merge branch 'master' of git://172.21.111.188/emulator
authorSon Hyunjun <hj79.son@samsung.com>
Mon, 5 Mar 2012 07:41:43 +0000 (16:41 +0900)
committerSon Hyunjun <hj79.son@samsung.com>
Mon, 5 Mar 2012 07:41:43 +0000 (16:41 +0900)

Trivial merge