Merge branch 'master' of git://172.21.111.188/emulator
authorSon Hyunjun <hj79.son@samsung.com>
Thu, 8 Mar 2012 11:56:48 +0000 (20:56 +0900)
committerSon Hyunjun <hj79.son@samsung.com>
Thu, 8 Mar 2012 11:56:48 +0000 (20:56 +0900)

Trivial merge