Merge "[Merge conflict resolved] [elm_navigationbar]: icon support in navigationbar...
authorShilpa Singh <shilpa.singh@samsung.com>
Thu, 31 Mar 2011 03:52:55 +0000 (12:52 +0900)
committerGerrit Code Review <git@Maetan>
Thu, 31 Mar 2011 03:52:55 +0000 (12:52 +0900)

Trivial merge