Merge "Merge Conflict resolved. [elm_conform]: review comments fixed for popup change...
authorshilpa onkar singh <shilpa.singh@samsung.com>
Fri, 18 Feb 2011 11:58:44 +0000 (20:58 +0900)
committerGerrit Code Review <git@Taebaek>
Fri, 18 Feb 2011 11:58:44 +0000 (20:58 +0900)

Trivial merge