Merge "[Merge conflict fixed] [Indentation fixed for popup, entry[only popup style...
authorShilpa Singh <shilpa.singh@samsung.com>
Tue, 19 Apr 2011 04:32:43 +0000 (13:32 +0900)
committerGerrit Code Review <git@Maetan>
Tue, 19 Apr 2011 04:32:43 +0000 (13:32 +0900)

Trivial merge