Merge "[Review comments fixed: removed scale, removed mistype, and made clip_content...
authorShilpa Singh <shilpa.singh@samsung.com>
Thu, 31 Mar 2011 03:52:36 +0000 (12:52 +0900)
committerGerrit Code Review <git@Maetan>
Thu, 31 Mar 2011 03:52:36 +0000 (12:52 +0900)

Trivial merge