[Upstream Initial Rebase r60246] Merge commit '78820d9fbecf976a98334c356dbc30d919dc3d...
authorDaniel Juyung Seo <juyung.seo@samsung.com>
Sun, 14 Aug 2011 07:03:05 +0000 (16:03 +0900)
committerDaniel Juyung Seo <juyung.seo@samsung.com>
Sun, 14 Aug 2011 07:03:07 +0000 (16:03 +0900)

Trivial merge