Merge branch 'master' of git://172.21.111.188/emulator
authorgiwoong.kim <giwoong.kim@samsung.com>
Thu, 8 Mar 2012 12:01:10 +0000 (21:01 +0900)
committergiwoong.kim <giwoong.kim@samsung.com>
Thu, 8 Mar 2012 12:01:10 +0000 (21:01 +0900)

Trivial merge