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

Trivial merge