Merge "merge upstream"
authorsangho park <sangho.g.park@samsung.com>
Fri, 8 Apr 2011 09:05:01 +0000 (18:05 +0900)
committerGerrit Code Review <git@Maetan>
Fri, 8 Apr 2011 09:05:01 +0000 (18:05 +0900)

Trivial merge