[Merge conflict resolved]
authorShilpa Singh <shilpa.singh@samsung.com>
Mon, 28 Mar 2011 09:23:42 +0000 (14:53 +0530)
committerShilpa Singh <shilpa.singh@samsung.com>
Mon, 28 Mar 2011 09:23:42 +0000 (14:53 +0530)
commit3d665754fbbc4e6baa294503950320fcf9147f85
treeedba4196a490a7b1b32584e2ecbafcb466e148a4
parentd199549aaa07909ca97b20273a0c61c1c3457583
[Merge conflict resolved]
[elm_navigationbar]: icon support in navigationbar and center alignment of text with equal padding on left and right.

Change-Id: I41c41b94b444fd5a6a3ef3058e03845498bb741c
themes/groups/navigationbar.edc