[Upstream Initiatial Rebase r60294] Merge commit '4b259b73be383e8a7320a70c7299f35bbf6...
authorDaniel Juyung Seo <juyung.seo@samsung.com>
Sun, 14 Aug 2011 07:09:42 +0000 (16:09 +0900)
committerDaniel Juyung Seo <juyung.seo@samsung.com>
Sun, 14 Aug 2011 07:09:51 +0000 (16:09 +0900)

Trivial merge