Merge branch 'master' of git://172.21.111.188/emulator
authorKitae Kim <kt920.kim@samsung.com>
Wed, 7 Mar 2012 14:09:31 +0000 (23:09 +0900)
committerKitae Kim <kt920.kim@samsung.com>
Wed, 7 Mar 2012 14:09:31 +0000 (23:09 +0900)

Trivial merge