Merge "[Review comments fixed, clip is not translated, clip is used for only clipping...
authorShilpa Singh <shilpa.singh@samsung.com>
Fri, 9 Dec 2011 09:18:26 +0000 (18:18 +0900)
committerGerrit Code Review <git@Maetan>
Fri, 9 Dec 2011 09:18:26 +0000 (18:18 +0900)

Trivial merge