Merge "[Merge conflict Resolved] [elm_navigationbar/elm_navigationbar_ex]: ...
authorShilpa Singh <shilpa.singh@samsung.com>
Fri, 8 Apr 2011 02:55:30 +0000 (11:55 +0900)
committerGerrit Code Review <git@Maetan>
Fri, 8 Apr 2011 02:55:30 +0000 (11:55 +0900)

Trivial merge