[Upstream Initial Rebase r60295]
authorDaniel Juyung Seo <juyung.seo@samsung.com>
Sun, 14 Aug 2011 06:14:14 +0000 (15:14 +0900)
committerDaniel Juyung Seo <juyung.seo@samsung.com>
Sun, 14 Aug 2011 06:14:14 +0000 (15:14 +0900)

Trivial merge