[Upstream Initial Rebase r60299]
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Tue, 16 Aug 2011 05:25:01 +0000 (14:25 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Tue, 16 Aug 2011 05:25:01 +0000 (14:25 +0900)

Trivial merge