Merge "[Map] Upstream merge r64851"
authorTae-Hwan Kim <the81.kim@samsung.com>
Mon, 7 Nov 2011 09:21:43 +0000 (18:21 +0900)
committerGerrit Code Review <git@Maetan>
Mon, 7 Nov 2011 09:21:43 +0000 (18:21 +0900)

Trivial merge