Merge "fix segfault & merge upstream & fix zoom bug"
authorDaniel Juyung Seo <juyung.seo@samsung.com>
Fri, 8 Apr 2011 13:01:56 +0000 (22:01 +0900)
committerGerrit Code Review <git@Maetan>
Fri, 8 Apr 2011 13:01:56 +0000 (22:01 +0900)

Trivial merge