Merge "[Map] Upstream sync (r66413, r66459)"
authorTae-Hwan Kim <the81.kim@samsung.com>
Fri, 23 Dec 2011 08:53:21 +0000 (17:53 +0900)
committerGerrit Code Review <gerrit2@localhost>
Fri, 23 Dec 2011 08:53:21 +0000 (17:53 +0900)

Trivial merge