Merge "upstream merge"
authorsangho park <sangho.g.park@samsung.com>
Mon, 18 Apr 2011 08:41:21 +0000 (17:41 +0900)
committerGerrit Code Review <git@Maetan>
Mon, 18 Apr 2011 08:41:21 +0000 (17:41 +0900)

Trivial merge