Merge branch 'master' of git://172.21.111.188/emulator
authorSon Hyunjun <hj79.son@samsung.com>
Thu, 8 Mar 2012 10:30:31 +0000 (19:30 +0900)
committerSon Hyunjun <hj79.son@samsung.com>
Thu, 8 Mar 2012 10:30:31 +0000 (19:30 +0900)

Trivial merge