Merge "[elm_map] upstream merge"
authorsangho park <sangho.g.park@samsung.com>
Thu, 28 Apr 2011 00:31:53 +0000 (09:31 +0900)
committerGerrit Code Review <git@Maetan>
Thu, 28 Apr 2011 00:31:53 +0000 (09:31 +0900)

Trivial merge