From: Shilpa Singh <shilpa.singh@samsung.com>
Date: Fri, 8 Apr 2011 02:55:30 +0000 (+0900)
Subject: Merge "[Merge conflict Resolved] [elm_navigationbar/elm_navigationbar_ex]:      ... 
X-Git-Tag: submit/2.0alpha-wayland/20121130.000903~874
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7ce6c9a4bd2ed8aaf0c2471ee8495f651732a52b;p=profile%2Fivi%2Fefl-theme-tizen.git

Merge "[Merge conflict Resolved] [elm_navigationbar/elm_navigationbar_ex]:                      1. Separator added for indicator clock                      2. Nbeat 1.1 max size of icon modified to 20x20"
---

7ce6c9a4bd2ed8aaf0c2471ee8495f651732a52b