[Merge conflict resolved]
authorshilpa singh <shilpa.singh@samsung.com>
Tue, 13 Dec 2011 11:30:46 +0000 (17:00 +0530)
committershilpa singh <shilpa.singh@samsung.com>
Wed, 21 Dec 2011 05:05:10 +0000 (10:35 +0530)
commita9e7850f6fc7a10c8ecafb5b0da72c874cef7075
treec135feaabd80c400b72858005f2cc0aad1b04486
parentc24cc43f68a09a453f274b26ab37f07ba0b09231
[Merge conflict resolved]
[Dialoguegroup->dialogue and separator style names updated according
to comments]
[elm_box/layout - dialogue group styles]

Change-Id: I4243fb3450814e6ff367b65567b40f64ba82dc0e
themes/widgets/genlist/genlist_edit.edc
themes/widgets/genlist/genlist_normal.edc